summaryrefslogtreecommitdiff
path: root/npc/functions
diff options
context:
space:
mode:
Diffstat (limited to 'npc/functions')
-rw-r--r--npc/functions/main.txt12
1 files changed, 4 insertions, 8 deletions
diff --git a/npc/functions/main.txt b/npc/functions/main.txt
index 06b12a30..abdaa5dd 100644
--- a/npc/functions/main.txt
+++ b/npc/functions/main.txt
@@ -292,15 +292,11 @@ function script any_of {
}
function script die {
- if ($HARDCORE) {
+ // Distinguish scripted deaths for perma-death mode
+ if ($HARDCORE)
@grace=true;
- 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 {
- addtimer 10, "#GlobalHandler::OnDie"; // Wait script execution to finish
- }
+ // Wait script execution to finish
+ addtimer 10, "#GlobalHandler::OnDie";
return;
}