summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2012-05-18 13:02:36 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2012-05-18 13:05:21 +0200
commit0069c32c14625f9770f8fa8961a48b7dc60d5c03 (patch)
tree168e14da497cfb724e022d685572fcdb0497073d /world/map/npc
parentcffae3f7cf7d3ae18c7bb02502979452671e8773 (diff)
downloadserverdata-0069c32c14625f9770f8fa8961a48b7dc60d5c03.tar.gz
serverdata-0069c32c14625f9770f8fa8961a48b7dc60d5c03.tar.bz2
serverdata-0069c32c14625f9770f8fa8961a48b7dc60d5c03.tar.xz
serverdata-0069c32c14625f9770f8fa8961a48b7dc60d5c03.zip
Fix a bug in Hasan that can cause him to be blocked infinitely.v2012.05.18
This was caused because the player could log out after the blocking variables were set, but before the timer was started that would free the NPC after a timeout.
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/042-1/hasan.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/world/map/npc/042-1/hasan.txt b/world/map/npc/042-1/hasan.txt
index ebd5c867..3ac2aa0f 100644
--- a/world/map/npc/042-1/hasan.txt
+++ b/world/map/npc/042-1/hasan.txt
@@ -92,11 +92,11 @@ L_Trick:
if ($@ScorpionFighter)
goto L_Wait;
mes "While you're scratching your head, you see Kaan coming nearer to the cliff above you.";
+ // close2 blocks
+ close2;
set $@ScorpionTimer, 0;
set $@ScorpionFighter, getcharid(3);
set $@ScorpDeath, PC_DIE_COUNTER;
- // close2 blocks
- close2;
monster "042-1.gat",110,70,"Scorpion",1003,1, "Hasan::onScorpionDeath";
initnpctimer;
end;