diff options
author | tobmaps <spambot42@yandex.ru> | 2011-05-13 18:53:01 +0700 |
---|---|---|
committer | tobmaps <spambot42@yandex.ru> | 2011-05-13 18:53:01 +0700 |
commit | 7fac55db666449f1cb2d89f1f566bca0465c5d4f (patch) | |
tree | ca50e19b3f42defa333c60182d623220d1a36c13 | |
parent | 048aa1c234aa9a887f260250f146d03256aff284 (diff) |
Core/Player: Don't allow to deactivate PvP mode in hostile/neutral zones at PvP realms
-rwxr-xr-x | src/server/game/Entities/Player/Player.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); |