From 40417f7fde1d74636abaea8bfbd8f0ebd6b38491 Mon Sep 17 00:00:00 2001 From: t3hk0d3 Date: Wed, 20 Jun 2012 02:29:56 +0400 Subject: [PATCH] Fixed PVP damage - now checked not only permission to deal damage to player, but also permission to take damage from player. Might be related to issue #36 --- .../java/ru/tehkode/modifyworld/handlers/EntityListener.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/ru/tehkode/modifyworld/handlers/EntityListener.java b/src/main/java/ru/tehkode/modifyworld/handlers/EntityListener.java index a44e4fd..0f667ca 100644 --- a/src/main/java/ru/tehkode/modifyworld/handlers/EntityListener.java +++ b/src/main/java/ru/tehkode/modifyworld/handlers/EntityListener.java @@ -47,7 +47,6 @@ public class EntityListener extends ModifyworldListener { player = (Player) edbe.getDamager(); if (permissionDenied(player, "modifyworld.damage.deal", event.getEntity())) { cancelDamageEvent(player, event); - return; } } @@ -56,7 +55,6 @@ public class EntityListener extends ModifyworldListener { if (edbe.getDamager() != null) { // Prevent from taking damage by entity if (_permissionDenied(player, "modifyworld.damage.take", edbe.getDamager())) { cancelDamageEvent(player, event); - return; } } }