diff options
| author | Necrodoom <doomed.war@gmail.com> | 2013-11-17 19:19:42 +0200 |
|---|---|---|
| committer | Necrodoom <doomed.war@gmail.com> | 2013-11-17 19:19:42 +0200 |
| commit | 872df26e9d8070e92060baef0fde9139db96fc42 (patch) | |
| tree | 7faf3e308bbc9218ca279d007af62da891855ccb /EssentialsProtect | |
| parent | 8146858ee08fef2d3ad7eae0c57df40292cd1adc (diff) | |
| download | Essentials-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)
Diffstat (limited to 'EssentialsProtect')
| -rw-r--r-- | EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java | 1 |
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);
|