diff options
| author | snowleo <schneeleo@gmail.com> | 2011-12-14 16:31:08 +0100 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2011-12-14 16:31:08 +0100 |
| commit | 0155bcedb7f00726d0b2f14e612a5342322a8278 (patch) | |
| tree | a490495781c26b553f719dda2b70ece6889a3605 /EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java | |
| parent | 9ab2fe54fcea6565bdfc29aa3e3c60cb07adf1b2 (diff) | |
| download | Essentials-0155bcedb7f00726d0b2f14e612a5342322a8278.tar Essentials-0155bcedb7f00726d0b2f14e612a5342322a8278.tar.gz Essentials-0155bcedb7f00726d0b2f14e612a5342322a8278.tar.lz Essentials-0155bcedb7f00726d0b2f14e612a5342322a8278.tar.xz Essentials-0155bcedb7f00726d0b2f14e612a5342322a8278.zip | |
Updated all modules to new api, some settings are still missing
Diffstat (limited to 'EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java')
| -rw-r--r-- | EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java index 89167b2b9..41b4a69a5 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.protect; -import com.earth2me.essentials.IEssentials; -import com.earth2me.essentials.User; +import com.earth2me.essentials.api.IEssentials; +import com.earth2me.essentials.api.IUser; import com.earth2me.essentials.craftbukkit.FakeExplosion; import java.util.Locale; import org.bukkit.Material; @@ -39,7 +39,7 @@ public class EssentialsProtectEntityListener extends EntityListener return; } - final User user = ess.getUser(target); + final IUser user = target instanceof Player ? ess.getUser((Player)target) : null; if (event instanceof EntityDamageByBlockEvent) { final DamageCause cause = event.getCause(); @@ -77,7 +77,7 @@ public class EssentialsProtectEntityListener extends EntityListener { final EntityDamageByEntityEvent edEvent = (EntityDamageByEntityEvent)event; final Entity eAttack = edEvent.getDamager(); - final User attacker = ess.getUser(eAttack); + final IUser attacker = eAttack instanceof Player ? ess.getUser((Player)eAttack) : null; // PVP Settings if (target instanceof Player && eAttack instanceof Player @@ -134,7 +134,7 @@ public class EssentialsProtectEntityListener extends EntityListener || (((Projectile)edEvent.getDamager()).getShooter() instanceof Player && prot.getSettingBool(ProtectConfig.disable_pvp) && (!user.isAuthorized("essentials.protect.pvp") - || !ess.getUser(((Projectile)edEvent.getDamager()).getShooter()).isAuthorized("essentials.protect.pvp"))))) + || !ess.getUser((Player)((Projectile)edEvent.getDamager()).getShooter()).isAuthorized("essentials.protect.pvp"))))) { event.setCancelled(true); return; @@ -299,7 +299,7 @@ public class EssentialsProtectEntityListener extends EntityListener { return; } - final User user = ess.getUser(event.getTarget()); + final IUser user = ess.getUser((Player)event.getTarget()); if ((event.getReason() == TargetReason.CLOSEST_PLAYER || event.getReason() == TargetReason.TARGET_ATTACKED_ENTITY || event.getReason() == TargetReason.PIG_ZOMBIE_TARGET |