summaryrefslogtreecommitdiffstats
path: root/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
diff options
context:
space:
mode:
Diffstat (limited to 'EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java')
-rw-r--r--EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
index 19c808d5f..4ded17f70 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
@@ -76,8 +76,8 @@ public class EssentialsProtectEntityListener extends EntityListener
{
if (EssentialsProtect.playerSettings.get("protect.disable.pvp"))
{
- User defender = User.get(eDefend);
- User attacker = User.get(eAttack);
+ User defender = Essentials.getStatic().getUser(eDefend);
+ User attacker = Essentials.getStatic().getUser(eAttack);
if (!defender.isAuthorized("essentials.protect.pvp") || !attacker.isAuthorized("essentials.protect.pvp"))
{
@@ -153,7 +153,7 @@ public class EssentialsProtectEntityListener extends EntityListener
if (event.getEntity() instanceof LivingEntity)
{
//Nicccccccccce plaaacccccccccce..
- int maxHeight = Essentials.getSettings().getEpCreeperMaxHeight();
+ int maxHeight = Essentials.getStatic().getSettings().getEpCreeperMaxHeight();
if (EssentialsProtect.guardSettings.get("protect.prevent.creeper-explosion")
|| EssentialsProtect.guardSettings.get("protect.prevent.creeper-blockdamage")
|| (maxHeight >= 0 && event.getLocation().getBlockY() > maxHeight))
@@ -246,7 +246,7 @@ public class EssentialsProtectEntityListener extends EntityListener
if (!(event.getTarget() instanceof Player)) {
return;
}
- User user = User.get(event.getTarget());
+ User user = Essentials.getStatic().getUser(event.getTarget());
if ((event.getReason() == TargetReason.CLOSEST_PLAYER ||
event.getReason() == TargetReason.TARGET_ATTACKED_ENTITY ||
event.getReason() == TargetReason.PIG_ZOMBIE_TARGET) &&