summaryrefslogtreecommitdiff
path: root/world
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2015-06-22 02:35:58 -0500
committerWushin <pasekei@gmail.com>2015-06-22 02:35:58 -0500
commit5b31008cc4d11be57ade8ae9885a511fc4b37ec8 (patch)
tree0524017dfaf4f492d49e81f6ef63570666619c35 /world
parent7e4b71a9ab8a4621ec164216ff4135611d545bbb (diff)
parent7457890d855c92747cd7801d66372581f1f2568c (diff)
downloadserverdata-5b31008cc4d11be57ade8ae9885a511fc4b37ec8.tar.gz
serverdata-5b31008cc4d11be57ade8ae9885a511fc4b37ec8.tar.bz2
serverdata-5b31008cc4d11be57ade8ae9885a511fc4b37ec8.tar.xz
serverdata-5b31008cc4d11be57ade8ae9885a511fc4b37ec8.zip
Merge pull request #330 from mekolat/patch-1
Make warp towels honor noteleport and nowarp
Diffstat (limited to 'world')
-rw-r--r--world/map/npc/items/warpTowels.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/world/map/npc/items/warpTowels.txt b/world/map/npc/items/warpTowels.txt
index 8e9ef4ac..dd8bc71e 100644
--- a/world/map/npc/items/warpTowels.txt
+++ b/world/map/npc/items/warpTowels.txt
@@ -6,7 +6,7 @@ function|script|WarpTowel
goto L_DontPanic;
if (isin("botcheck",25,27,51,47))
goto L_Prison;
- if (getmapflag(getmap(), MF_NOSAVE) || isin("009-7",$@fightclub_x1,$@fightclub_y1,$@fightclub_x2,$@fightclub_y2))
+ if (getmapflag(getmap(), MF_NOSAVE) || getmapflag(getmap(), MF_NOTELEPORT) || getmapflag(getmap(), MF_NOWARP) || isin("009-7",$@fightclub_x1,$@fightclub_y1,$@fightclub_x2,$@fightclub_y2))
goto L_Forbid;
callfunc "MultiWarpTowel";