From 7fac55db666449f1cb2d89f1f566bca0465c5d4f Mon Sep 17 00:00:00 2001 From: tobmaps Date: Fri, 13 May 2011 18:53:01 +0700 Subject: Core/Player: Don't allow to deactivate PvP mode in hostile/neutral zones at PvP realms --- src/server/game/Entities/Player/Player.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index e6d38dee3ec..3f7e6c9c1e6 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -19049,7 +19049,7 @@ void Player::UpdatePvPFlag(time_t currTime) { if (!IsPvP()) return; - if (pvpInfo.endTimer == 0 || currTime < (pvpInfo.endTimer + 300)) + if (pvpInfo.endTimer == 0 || currTime < (pvpInfo.endTimer + 300) || pvpInfo.inHostileArea) return; UpdatePvP(false); -- cgit v1.2.3