From eca038e00b9937d6c177bd8cddc8b5b1a2e9c5a9 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Wed, 13 May 2020 00:57:23 -0300
Subject: Replace our script-induced deaths with new, custom, die() command
 This will fix one of the HardCore Server bugs.

---
 npc/017-1/drowned_man.txt   | 2 +-
 npc/017-1/paxel.txt         | 4 ++--
 npc/017-1/pet_detective.txt | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'npc/017-1')

diff --git a/npc/017-1/drowned_man.txt b/npc/017-1/drowned_man.txt
index 326b3dd69..bd3c693a2 100644
--- a/npc/017-1/drowned_man.txt
+++ b/npc/017-1/drowned_man.txt
@@ -135,7 +135,7 @@ OnInit:
         if (is_between(5220, 5270, .x*32) && is_between(7330, 7390, .y*32))
             goto L_GoodJump;
         dispbottom l("The water was too shallow...");
-        percentheal -100, -100;
+        die();
         end;
     }
     closeclientdialog;
diff --git a/npc/017-1/paxel.txt b/npc/017-1/paxel.txt
index 40c2f603d..0d1df6687 100644
--- a/npc/017-1/paxel.txt
+++ b/npc/017-1/paxel.txt
@@ -182,7 +182,7 @@ L_Spring:
 OnTouch:
     if (BaseLevel < 20)
     {
-        percentheal -100, -100; // Shouldn't be here
+        die(); // Shouldn't be here
         end;
     }
     addtimer(100, "Paxel::OnOmattizator");
@@ -246,7 +246,7 @@ OnOmattizator4:
 
     slide 130, 23;
     emotion E_FURIOUS;
-    percentheal -100, -100;
+    die();
     end;
 
 function maybeTowel {
diff --git a/npc/017-1/pet_detective.txt b/npc/017-1/pet_detective.txt
index e98b0e6e6..293500df7 100644
--- a/npc/017-1/pet_detective.txt
+++ b/npc/017-1/pet_detective.txt
@@ -37,7 +37,7 @@ L_Register:
     if (Zeny < 5000) {
         mesn l("Ace Ventura");
         mesq l("Oh, but we are affiliated with Jesusalva, whom hates cheaters. So, meet your dismissal!");
-        percentheal -100, 0;
+        die();
         /*
         .@val=(Zeny/10)*2;
         Zeny=(Zeny/10)*8; // You pay 20% of your GP as tax-money. Hasan gladly takes the money. Jesusalva's happy.
-- 
cgit v1.2.3-70-g09d2