From 872df26e9d8070e92060baef0fde9139db96fc42 Mon Sep 17 00:00:00 2001 From: Necrodoom Date: Sun, 17 Nov 2013 19:19:42 +0200 Subject: Do not block user damaging self (ender eye) --- .../com/earth2me/essentials/protect/EssentialsProtectEntityListener.java | 1 + 1 file changed, 1 insertion(+) diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java index 1336f3e07..111751c2d 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java @@ -124,6 +124,7 @@ public class EssentialsProtectEntityListener implements Listener // PVP Settings if (target instanceof Player && eAttack instanceof Player && prot.getSettingBool(ProtectConfig.disable_pvp) + && !user.getName().equalsIgnoreCase(attacker.getName()) && (!user.isAuthorized("essentials.protect.pvp") || !attacker.isAuthorized("essentials.protect.pvp"))) { event.setCancelled(true); -- cgit v1.2.3