diff options
| author | snowleo <schneeleo@gmail.com> | 2011-06-23 13:49:37 +0200 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2011-06-23 13:49:37 +0200 |
| commit | 9d6727daf2c1cbf8660ff251c85418ef122e97e9 (patch) | |
| tree | 029adb76af0d6af7a6fd834ecf16b9b5f4057966 /EssentialsProtect/src/com | |
| parent | c6aa5f1e6858095554713520bcbce616ef10834e (diff) | |
| parent | ca9364d25bc3c50698fc5a79b1d9916615c11851 (diff) | |
| download | Essentials-9d6727daf2c1cbf8660ff251c85418ef122e97e9.tar Essentials-9d6727daf2c1cbf8660ff251c85418ef122e97e9.tar.gz Essentials-9d6727daf2c1cbf8660ff251c85418ef122e97e9.tar.lz Essentials-9d6727daf2c1cbf8660ff251c85418ef122e97e9.tar.xz Essentials-9d6727daf2c1cbf8660ff251c85418ef122e97e9.zip | |
Merge branch 'bukkitupdate'
Conflicts:
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
Diffstat (limited to 'EssentialsProtect/src/com')
| -rw-r--r-- | EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java index cd3977b71..42a55c874 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java @@ -290,7 +290,10 @@ public class EssentialsProtectEntityListener extends EntityListener final User user = ess.getUser(event.getTarget());
if ((event.getReason() == TargetReason.CLOSEST_PLAYER
|| event.getReason() == TargetReason.TARGET_ATTACKED_ENTITY
- || event.getReason() == TargetReason.PIG_ZOMBIE_TARGET)
+ || event.getReason() == TargetReason.PIG_ZOMBIE_TARGET
+ || event.getReason() == TargetReason.RANDOM_TARGET
+ || event.getReason() == TargetReason.TARGET_ATTACKED_OWNER
+ || event.getReason() == TargetReason.OWNER_ATTACKED_TARGET)
&& prot.getSettingBool(ProtectConfig.prevent_entitytarget)
&& !user.isAuthorized("essentials.protect.entitytarget.bypass"))
{
|