diff options
author | snowleo <schneeleo@gmail.com> | 2011-06-06 22:29:08 +0200 |
---|---|---|
committer | snowleo <schneeleo@gmail.com> | 2011-06-06 22:29:08 +0200 |
commit | a45e620946c8e748b35258b7f8813d1c788bae37 (patch) | |
tree | 76b100b6dda862e6d714f85ef9bd40f68bd3b51c /EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java | |
parent | d8778801711ef6c78445baa5da38f4591db0b6c2 (diff) | |
download | Essentials-a45e620946c8e748b35258b7f8813d1c788bae37.tar Essentials-a45e620946c8e748b35258b7f8813d1c788bae37.tar.gz Essentials-a45e620946c8e748b35258b7f8813d1c788bae37.tar.lz Essentials-a45e620946c8e748b35258b7f8813d1c788bae37.tar.xz Essentials-a45e620946c8e748b35258b7f8813d1c788bae37.zip |
Major cleanup of the Protect code
Diffstat (limited to 'EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java')
-rw-r--r-- | EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java | 48 |
1 files changed, 28 insertions, 20 deletions
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java index 4c9b2c5fd..4d69fb31f 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java @@ -1,39 +1,45 @@ package com.earth2me.essentials.protect; +import com.earth2me.essentials.IEssentials; import org.bukkit.block.Block; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerListener; import org.bukkit.inventory.ItemStack; -import com.earth2me.essentials.Essentials; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; + public class EssentialsProtectPlayerListener extends PlayerListener { - private EssentialsProtect parent; + private final transient IProtect prot; + private final transient IEssentials ess; - public EssentialsProtectPlayerListener(EssentialsProtect parent) + public EssentialsProtectPlayerListener(final IProtect prot) { - - this.parent = parent; + this.prot = prot; + this.ess = prot.getEssentials(); } @Override - public void onPlayerInteract(PlayerInteractEvent event) + public void onPlayerInteract(final PlayerInteractEvent event) { - if (event.isCancelled()) return; - ItemStack item = event.getItem(); - User user = parent.ess.getUser(event.getPlayer()); - Block blockClicked = event.getClickedBlock(); + if (event.isCancelled()) + { + return; + } + + final User user = ess.getUser(event.getPlayer()); - if (EssentialsProtect.playerSettings.get("protect.disable.build") && !user.canBuild()) + if (prot.getSettingBool(ProtectConfig.disable_build) && !user.canBuild()) { event.setCancelled(true); return; } - - if (item != null && EssentialsProtect.checkProtectionItems(EssentialsProtect.usageList, item.getTypeId()) && !user.isAuthorized("essentials.protect.exemptusage")) + final ItemStack item = event.getItem(); + if (item != null + && prot.checkProtectionItems(ProtectConfig.blacklist_usage, item.getTypeId()) + && !user.isAuthorized("essentials.protect.exemptusage")) { event.setCancelled(true); return; @@ -41,26 +47,28 @@ public class EssentialsProtectPlayerListener extends PlayerListener if (user.isAuthorized("essentials.protect.admin")) { - StringBuilder sb = new StringBuilder(); + final StringBuilder stringBuilder = new StringBuilder(); boolean first = true; - for (String owner : EssentialsProtect.getStorage().getOwners(blockClicked)) + final Block blockClicked = event.getClickedBlock(); + for (String owner : prot.getStorage().getOwners(blockClicked)) { if (!first) { - sb.append(", "); + stringBuilder.append(", "); } first = false; - sb.append(owner); + stringBuilder.append(owner); } - String ownerNames = sb.toString(); + final String ownerNames = stringBuilder.toString(); if (ownerNames != null && !ownerNames.isEmpty()) { user.sendMessage(Util.format("protectionOwner", ownerNames)); } } - if (item != null && EssentialsProtect.onUseAlert.contains(String.valueOf(item.getTypeId()))) + if (item != null + && prot.checkProtectionItems(ProtectConfig.alert_on_use, item.getTypeId())) { - parent.alert(user, item.getType().toString(), Util.i18n("alertUsed")); + prot.alert(user, item.getType().toString(), Util.i18n("alertUsed")); } } } |