diff options
Diffstat (limited to 'EssentialsProtect')
4 files changed, 20 insertions, 20 deletions
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java index 7a0baecdb..6458558e0 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java @@ -97,16 +97,16 @@ public class EssentialsProtect extends JavaPlugin public static void loadSettings() { - dataSettings = Essentials.getSettings().getEpDBSettings(); - genSettings = Essentials.getSettings().getEpSettings(); - guardSettings = Essentials.getSettings().getEpGuardSettings(); - usageList = Essentials.getSettings().epBlackListUsage(); - blackListPlace = Essentials.getSettings().epBlackListPlacement(); - breakBlackList = Essentials.getSettings().epBlockBreakingBlacklist(); - onPlaceAlert = Essentials.getSettings().getEpAlertOnPlacement(); - onUseAlert = Essentials.getSettings().getEpAlertOnUse(); - onBreakAlert = Essentials.getSettings().getEpAlertOnBreak(); - playerSettings = Essentials.getSettings().getEpPlayerSettings(); + dataSettings = Essentials.getStatic().getSettings().getEpDBSettings(); + genSettings = Essentials.getStatic().getSettings().getEpSettings(); + guardSettings = Essentials.getStatic().getSettings().getEpGuardSettings(); + usageList = Essentials.getStatic().getSettings().epBlackListUsage(); + blackListPlace = Essentials.getStatic().getSettings().epBlackListPlacement(); + breakBlackList = Essentials.getStatic().getSettings().epBlockBreakingBlacklist(); + onPlaceAlert = Essentials.getStatic().getSettings().getEpAlertOnPlacement(); + onUseAlert = Essentials.getStatic().getSettings().getEpAlertOnUse(); + onBreakAlert = Essentials.getStatic().getSettings().getEpAlertOnBreak(); + playerSettings = Essentials.getStatic().getSettings().getEpPlayerSettings(); EssentialsProtectData.createSqlTable(); } @@ -115,7 +115,7 @@ public class EssentialsProtect extends JavaPlugin Location loc = user.getLocation(); for (Player p : this.getServer().getOnlinePlayers()) { - User alertUser = User.get(p); + User alertUser = Essentials.getStatic().getUser(p); if (alertUser.isAuthorized("essentials.protect.alerts")) alertUser.sendMessage(ChatColor.DARK_AQUA + "[" + user.getName() + "] " + ChatColor.WHITE + type + ChatColor.GOLD + item + " at: " + EssentialsProtectData.formatCoords(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); } diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java index 640f70d8f..d15ab6067 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java @@ -40,11 +40,11 @@ public class EssentialsProtectBlockListener extends BlockListener if (event.isCancelled()) return; initialize(); ItemStack item = event.getItemInHand(); - User user = User.get(event.getPlayer()); + User user = Essentials.getStatic().getUser(event.getPlayer()); if (EssentialsProtect.playerSettings.get("protect.disable.build") && !user.canBuild()) { - if(Essentials.getSettings().warnOnBuildDisallow()) + if(Essentials.getStatic().getSettings().warnOnBuildDisallow()) { user.sendMessage(ChatColor.RED + "You are not permitted to build"); } @@ -227,7 +227,7 @@ public class EssentialsProtectBlockListener extends BlockListener { if (event.isCancelled()) return; initialize(); - User user = User.get(event.getPlayer()); + User user = Essentials.getStatic().getUser(event.getPlayer()); Block block = event.getBlock(); if (EssentialsProtect.playerSettings.get("protect.disable.build") && !user.canBuild()) { 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) &&
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java index 8de1ee701..b3f6b09a0 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java @@ -34,12 +34,12 @@ public class EssentialsProtectPlayerListener extends PlayerListener initialize(); if (event.isCancelled()) return; ItemStack item = event.getItem(); - User user = User.get(event.getPlayer()); + User user = Essentials.getStatic().getUser(event.getPlayer()); Block blockClicked = event.getClickedBlock(); if (EssentialsProtect.playerSettings.get("protect.disable.build") && !user.canBuild()) { - if(Essentials.getSettings().warnOnBuildDisallow()) + if(Essentials.getStatic().getSettings().warnOnBuildDisallow()) { user.sendMessage(ChatColor.RED + "You are not permitted to build"); } |