diff options
| author | Wushin <pasekei@gmail.com> | 2014-11-14 00:26:49 -0600 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2014-11-14 00:26:49 -0600 |
| commit | 39ccb932b39ec342ce940fc990ed09052f81b7eb (patch) | |
| tree | d532de9fd8fffe36fc1aa6b421ba0a6de5676c05 /world/map/npc/functions | |
| parent | 10846f235e6c3a531f1b4691785556b5d5ac68cd (diff) | |
| parent | 29ddbded7eb9666df30e67f25fcbee467bbd124f (diff) | |
| download | serverdata-39ccb932b39ec342ce940fc990ed09052f81b7eb.tar.gz serverdata-39ccb932b39ec342ce940fc990ed09052f81b7eb.tar.bz2 serverdata-39ccb932b39ec342ce940fc990ed09052f81b7eb.tar.xz serverdata-39ccb932b39ec342ce940fc990ed09052f81b7eb.zip | |
Merge pull request #203 from mekolat/fightclub-fix
Fightclub fix
Diffstat (limited to 'world/map/npc/functions')
| -rw-r--r-- | world/map/npc/functions/global_event_handler.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/world/map/npc/functions/global_event_handler.txt b/world/map/npc/functions/global_event_handler.txt index 0e5650e1..f05e3b62 100644 --- a/world/map/npc/functions/global_event_handler.txt +++ b/world/map/npc/functions/global_event_handler.txt @@ -20,7 +20,7 @@ OnPCDieEvent: // custom handlers below L_Fightclub_Killed: - set @killer, 0; + set @duel_killer, 0; if(@Duel_Fighter != 1) goto L_End; if(getmap() != "009-7") goto L_End; set $@duel_loser, getcharid(3); // grab the rid of the victim @@ -30,7 +30,7 @@ L_Fightclub_Killed: goto L_End; L_Fightclub_Die: - set @killer, 0; + set @duel_killer, 0; if(@Duel_Fighter != 1) goto L_End; if(getmap() != "009-7") goto L_End; set @killerrid, 0; // since the player was not murdered, the killerrid is 0 |