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/items/warpTowels.txt | |
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/items/warpTowels.txt')
-rw-r--r-- | world/map/npc/items/warpTowels.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/world/map/npc/items/warpTowels.txt b/world/map/npc/items/warpTowels.txt index ac82c92b..585112ff 100644 --- a/world/map/npc/items/warpTowels.txt +++ b/world/map/npc/items/warpTowels.txt @@ -5,12 +5,12 @@ function|script|WarpTowel goto L_DontPanic; if (isin("botcheck.gat",25,27,51,47)) goto L_Prison; - if (getmapflag(getmap(), MF_NOSAVE)) + if (getmapflag(getmap(), MF_NOSAVE) || isin("009-7.gat",$@fightclub_x1,$@fightclub_y1,$@fightclub_x2,$@fightclub_y2)) goto L_Forbid; callfunc "MultiWarpTowel"; - if (@warpTowelName$ == "HitchhikersTowel") + if (@warpTowelName$ == "HitchhikersTowel") goto L_Save; if(@warpTowelName$ == "WhiteHitchhikersTowel") goto L_White; |