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 | 5dc1a70bcb6193c82a7612d9b61da9c1462e741c (patch) | |
| tree | 6d58b69807a7a6d0db1f62c3d5b5c8c9653c6b44 /EssentialsProtect | |
| parent | 9c5a1bd70289ff22ed8ee31de0f31098a56227cc (diff) | |
| parent | 909190ef4fd13c7f8cf7f47e3bfcab370c27607f (diff) | |
| download | Essentials-5dc1a70bcb6193c82a7612d9b61da9c1462e741c.tar Essentials-5dc1a70bcb6193c82a7612d9b61da9c1462e741c.tar.gz Essentials-5dc1a70bcb6193c82a7612d9b61da9c1462e741c.tar.lz Essentials-5dc1a70bcb6193c82a7612d9b61da9c1462e741c.tar.xz Essentials-5dc1a70bcb6193c82a7612d9b61da9c1462e741c.zip | |
Merge branch 'bukkitupdate'
Conflicts:
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
Diffstat (limited to 'EssentialsProtect')
| -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"))
{
|