diff options
| author | mekolat <mekolat@users.noreply.github.com> | 2016-04-08 16:19:38 -0400 |
|---|---|---|
| committer | mekolat <mekolat@users.noreply.github.com> | 2016-04-08 16:19:38 -0400 |
| commit | 58d77868475d2dbdd2914cd99e45442ceb0eaf8b (patch) | |
| tree | 088db5b6361b483514fdd7e7b3cacf98b8c18a1f /src/map/script-fun.cpp | |
| parent | 3663a754ca986f2d26095650ae6ac86c500e3225 (diff) | |
| download | tmwa-58d77868475d2dbdd2914cd99e45442ceb0eaf8b.tar.gz tmwa-58d77868475d2dbdd2914cd99e45442ceb0eaf8b.tar.bz2 tmwa-58d77868475d2dbdd2914cd99e45442ceb0eaf8b.tar.xz tmwa-58d77868475d2dbdd2914cd99e45442ceb0eaf8b.zip | |
do not check for NOPVP flag on pvpoff
Diffstat (limited to 'src/map/script-fun.cpp')
| -rw-r--r-- | src/map/script-fun.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp index a06eb1b..ce765a2 100644 --- a/src/map/script-fun.cpp +++ b/src/map/script-fun.cpp @@ -2316,7 +2316,7 @@ void builtin_pvpoff(ScriptState *st) { MapName str = stringish<MapName>(ZString(conv_str(st, &AARG(0)))); P<map_local> m = TRY_UNWRAP(map_mapname2mapid(str), return); - if (m->flag.get(MapFlag::PVP) && m->flag.get(MapFlag::NOPVP)) + if (m->flag.get(MapFlag::PVP)) { m->flag.set(MapFlag::PVP, 0); |