summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
authormeko <mekolat@users.noreply.github.com>2015-04-15 12:26:17 -0400
committermeko <mekolat@users.noreply.github.com>2015-04-15 12:26:17 -0400
commit7457890d855c92747cd7801d66372581f1f2568c (patch)
tree1e608e77d98b841f1204c57d3c9fef414d6325c0 /world/map/npc
parent85a8149eeb2fde05a28863516399b667b9ab3c81 (diff)
downloadserverdata-7457890d855c92747cd7801d66372581f1f2568c.tar.gz
serverdata-7457890d855c92747cd7801d66372581f1f2568c.tar.bz2
serverdata-7457890d855c92747cd7801d66372581f1f2568c.tar.xz
serverdata-7457890d855c92747cd7801d66372581f1f2568c.zip
Make warp towels honor noteleport and nowarp
```noteleport``` makes the player unable to use warp towel ```nowarp``` makes the player AND GMs (with gm level under ```any_warp_GM_min_level```) unable to warp or use warp towel
Diffstat (limited to 'world/map/npc')
-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 f586ed99..e1ca89ee 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";