summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNecrodoom <doomed.war@gmail.com>2013-11-17 19:19:42 +0200
committerNecrodoom <doomed.war@gmail.com>2013-11-17 19:19:42 +0200
commit872df26e9d8070e92060baef0fde9139db96fc42 (patch)
tree7faf3e308bbc9218ca279d007af62da891855ccb
parent8146858ee08fef2d3ad7eae0c57df40292cd1adc (diff)
downloadEssentials-872df26e9d8070e92060baef0fde9139db96fc42.tar
Essentials-872df26e9d8070e92060baef0fde9139db96fc42.tar.gz
Essentials-872df26e9d8070e92060baef0fde9139db96fc42.tar.lz
Essentials-872df26e9d8070e92060baef0fde9139db96fc42.tar.xz
Essentials-872df26e9d8070e92060baef0fde9139db96fc42.zip
Do not block user damaging self (ender eye)
-rw-r--r--EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java1
1 files changed, 1 insertions, 0 deletions
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);