diff options
author | Jessica Tölke <jtoelke@mail.upb.de> | 2011-09-03 10:12:46 +0200 |
---|---|---|
committer | Jessica Tölke <jtoelke@mail.upb.de> | 2011-09-03 10:12:46 +0200 |
commit | 658eb67e7875c48e24a9bf7856d38393e43469dc (patch) | |
tree | 978f6a7fa50c3840947774b22f8e402e44a54f99 /world/map/npc/001-1 | |
parent | 933e56a6376aace0ead84d2316bfcaf52627f612 (diff) | |
parent | 68bd50cba8dc9c46d438a31d6184a4fd18c8057a (diff) | |
download | serverdata-658eb67e7875c48e24a9bf7856d38393e43469dc.tar.gz serverdata-658eb67e7875c48e24a9bf7856d38393e43469dc.tar.bz2 serverdata-658eb67e7875c48e24a9bf7856d38393e43469dc.tar.xz serverdata-658eb67e7875c48e24a9bf7856d38393e43469dc.zip |
Merge remote-tracking branch 'mainline/master'
Diffstat (limited to 'world/map/npc/001-1')
-rw-r--r-- | world/map/npc/001-1/elanore.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/world/map/npc/001-1/elanore.txt b/world/map/npc/001-1/elanore.txt index c91971a3..2607bf29 100644 --- a/world/map/npc/001-1/elanore.txt +++ b/world/map/npc/001-1/elanore.txt @@ -154,7 +154,8 @@ L_Main: close; OnPCKillEvent: - attachrid(@killerrid); + if (attachrid(@killerrid) == 0) + end; set @Q_heal_exp, MAGIC_EXPERIENCE >> 24; if (@Q_heal_exp < 8) goto L_OnPcKillWipe; set @Q_heal_exp, @Q_heal_exp - 8; |