From 58d77868475d2dbdd2914cd99e45442ceb0eaf8b Mon Sep 17 00:00:00 2001
From: mekolat <mekolat@users.noreply.github.com>
Date: Fri, 8 Apr 2016 16:19:38 -0400
Subject: do not check for NOPVP flag on pvpoff

---
 src/map/script-fun.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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);
 
-- 
cgit v1.2.3-60-g2f50