summaryrefslogtreecommitdiff
path: root/src/game-server/being.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game-server/being.cpp')
-rw-r--r--src/game-server/being.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/game-server/being.cpp b/src/game-server/being.cpp
index cec2c4e6..ace30861 100644
--- a/src/game-server/being.cpp
+++ b/src/game-server/being.cpp
@@ -190,6 +190,11 @@ void Being::performAttack(Damage const &damage, AttackZone const *attackZone)
int type = o->getType();
if (type != OBJECT_CHARACTER && type != OBJECT_MONSTER) continue;
+ if (getMap()->getPvP() == PVP_NONE &&
+ type == OBJECT_CHARACTER &&
+ getType() == OBJECT_CHARACTER)
+ continue;
+
LOG_DEBUG("Attack Zone:"<<
attPos.x<<":"<<attPos.y<<
" "<<