2 files changed, 6 insertions, 2 deletions
diff --git a/npc/functions/global_event_handler.txt b/npc/functions/global_event_handler.txt
index 69972292..f611e997 100644
--- a/npc/functions/global_event_handler.txt
+++ b/npc/functions/global_event_handler.txt
@@ -46,4 +46,8 @@ OnClock1700:
 OnInit:
     MOTD(); // set the MOTD array
     end;
+
+OnDie:
+    percentheal -100, -100;
+    end;
 }
diff --git a/npc/functions/main.txt b/npc/functions/main.txt
index d072ff60..4a0c9c22 100644
--- a/npc/functions/main.txt
+++ b/npc/functions/main.txt
@@ -294,12 +294,12 @@ function	script	any_of	{
 function	script	die	{
     if ($HARDCORE) {
         @grace=true;
-        percentheal -100, -100;
+        addtimer 10, "#GlobalHandler::OnDie"; // Wait script execution to finish
         //setparam(Hp, 1);
         //warp "000-1", 22, 22;
         //end; // MUST be end; to mimic official behavior
     } else {
-        percentheal -100, -100;
+        addtimer 10, "#GlobalHandler::OnDie"; // Wait script execution to finish
     }
     return;
 }