From 448e71808532deb5c7046577ee0f344995b1bdd7 Mon Sep 17 00:00:00 2001 From: ementalo Date: Thu, 11 Oct 2012 16:46:23 +0100 Subject: Remove user assignment in anti build listeners. --- .../src/net/ess3/permissions/BasePermission.java | 1 + .../antibuild/EssentialsAntiBuildListener.java | 66 ++++------------------ .../src/net/ess3/antibuild/EssentialsConnect.java | 10 ++-- 3 files changed, 15 insertions(+), 62 deletions(-) diff --git a/Essentials/src/net/ess3/permissions/BasePermission.java b/Essentials/src/net/ess3/permissions/BasePermission.java index c8198c1e2..61b89e6c2 100644 --- a/Essentials/src/net/ess3/permissions/BasePermission.java +++ b/Essentials/src/net/ess3/permissions/BasePermission.java @@ -9,6 +9,7 @@ public class BasePermission extends AbstractSuperpermsPermission { this.permission = base + permission; } + @Override public String getPermissionName() { return permission; diff --git a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java index d57b05ce4..ad6c0a5d0 100644 --- a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java +++ b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java @@ -1,11 +1,8 @@ package net.ess3.antibuild; -import java.util.logging.Level; import static net.ess3.I18n._; import net.ess3.api.IEssentials; import net.ess3.api.IUser; -import net.ess3.permissions.MaterialDotStarPermission; -import net.ess3.user.User; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Entity; @@ -34,54 +31,17 @@ public class EssentialsAntiBuildListener implements Listener this.ess = antib.getEssentialsConnect().getEssentials(); } - /*private boolean metaPermCheck(final User user, final String action, final Block block) - { - if (block == null) - { - return false; - } - return metaPermCheck(user, action, block.getTypeId(), block.getData()); - } - - private boolean metaPermCheck(final User user, final String action, final int blockId) - { - final String blockPerm = "essentials.build." + action + "." + blockId; - return user.isAuthorized(blockPerm); - } - - private boolean metaPermCheck(final User user, final String action, final int blockId, final byte data) - { - final String blockPerm = "essentials.build." + action + "." + blockId; - final String dataPerm = blockPerm + ":" + data; - - if (user.isPermissionSet(dataPerm)) - { - return user.isAuthorized(dataPerm); - } - else - { - if (ess.getSettings().isDebug()) - { - ess.getLogger().log(Level.INFO, "DataValue perm on " + user.getName() + " is not directly set: " + dataPerm); - } - } - - return user.isAuthorized(blockPerm); - }*/ - @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onBlockPlace(final BlockPlaceEvent event) { - final IUser user = ess.getUserMap().getUser(event.getPlayer()); + final Player user = event.getPlayer(); final Block block = event.getBlockPlaced(); final int typeId = block.getTypeId(); final Material type = block.getType(); - if (antib.getSettings().getData().isDisableBuild() - //&& !user.canBuild() + if (antib.getSettings().getData().isDisableBuild() && !Permissions.BUILD.isAuthorized(user) - && !Permissions.PLACEMENT.isAuthorized(user, block)) - //metaPermCheck(user, "place", block)) todo - double check metadata + && !Permissions.PLACEMENT.isAuthorized(user, block)) { if (antib.getSettings().getData().isWarnOnBuildDisallow()) { @@ -111,13 +71,12 @@ public class EssentialsAntiBuildListener implements Listener @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onBlockBreak(final BlockBreakEvent event) { - final IUser user = ess.getUserMap().getUser(event.getPlayer()); + final Player user = event.getPlayer(); final Block block = event.getBlock(); final int typeId = block.getTypeId(); final Material type = block.getType(); - if (antib.getSettings().getData().isDisableBuild() - //&& !user.canBuild() + if (antib.getSettings().getData().isDisableBuild() && !Permissions.BUILD.isAuthorized(user) && !Permissions.BREAK.isAuthorized(user, block)) { @@ -154,7 +113,6 @@ public class EssentialsAntiBuildListener implements Listener { final IUser user = ess.getUserMap().getUser((Player)entity); if (antib.getSettings().getData().isDisableBuild() - //&& !user.canBuild() && !Permissions.BUILD.isAuthorized(user) && !Permissions.BREAK.isAuthorized(user, Material.PAINTING, null)) { @@ -198,7 +156,7 @@ public class EssentialsAntiBuildListener implements Listener public void onPlayerInteract(final PlayerInteractEvent event) { // Do not return if cancelled, because the interact event has 2 cancelled states. - final IUser user = ess.getUserMap().getUser(event.getPlayer()); + final Player user = event.getPlayer(); final ItemStack item = event.getItem(); if (item != null @@ -221,7 +179,6 @@ public class EssentialsAntiBuildListener implements Listener } if (antib.getSettings().getData().isDisableUse() - //&& !user.canBuild() && !Permissions.BUILD.isAuthorized(user)) { if (event.hasItem() && !Permissions.INTERACT.isAuthorized(user, item.getType(), item.getData())) @@ -251,11 +208,10 @@ public class EssentialsAntiBuildListener implements Listener if (entity instanceof Player) { - final IUser user = ess.getUserMap().getUser((Player)entity); + final Player user = (Player)entity; final ItemStack item = event.getRecipe().getResult(); if (antib.getSettings().getData().isDisableUse() - //&& !user.canBuild() && !Permissions.BUILD.isAuthorized(user)) { if (!Permissions.CRAFT.isAuthorized(user, item.getType(), item.getData())) @@ -274,11 +230,10 @@ public class EssentialsAntiBuildListener implements Listener public void onPlayerPickupItem(PlayerPickupItemEvent event) { - final IUser user = ess.getUserMap().getUser(event.getPlayer()); + final Player user = event.getPlayer(); final ItemStack item = event.getItem().getItemStack(); - if (antib.getSettings().getData().isDisableUse() - //&& !user.canBuild() + if (antib.getSettings().getData().isDisableUse() && !Permissions.BUILD.isAuthorized(user)) { if (!Permissions.PICKUP.isAuthorized(user, item.getType(), item.getData())) @@ -293,11 +248,10 @@ public class EssentialsAntiBuildListener implements Listener public void onPlayerDropItem(final PlayerDropItemEvent event) { - final IUser user = ess.getUserMap().getUser(event.getPlayer()); + final Player user = event.getPlayer(); final ItemStack item = event.getItemDrop().getItemStack(); if (antib.getSettings().getData().isDisableUse() - //&& !user.canBuild() && !Permissions.BUILD.isAuthorized(user)); { if (!Permissions.DROP.isAuthorized(user, item.getType(), item.getData())) diff --git a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsConnect.java b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsConnect.java index 042c9a727..efa549172 100644 --- a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsConnect.java +++ b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsConnect.java @@ -4,7 +4,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import static net.ess3.I18n._; import net.ess3.api.IEssentials; -import net.ess3.api.IUser; import net.ess3.bukkit.BukkitPlugin; import org.bukkit.Location; import org.bukkit.entity.Player; @@ -37,19 +36,18 @@ public class EssentialsConnect return ess; } - public void alert(final IUser user, final String item, final String type) + public void alert(final Player user, final String item, final String type) { - final Location loc = user.getPlayer().getLocation(); + final Location loc = user.getLocation(); final String warnMessage = _("alertFormat", user.getName(), type, item, loc.getWorld().getName() + "," + loc.getBlockX() + "," + loc.getBlockY() + "," + loc.getBlockZ()); LOGGER.log(Level.WARNING, warnMessage); for (Player p : ess.getServer().getOnlinePlayers()) { - final IUser alertUser = ess.getUserMap().getUser(p); - if (Permissions.ALERTS.isAuthorized(alertUser)) + if (Permissions.ALERTS.isAuthorized(p)) { - alertUser.sendMessage(warnMessage); + p.sendMessage(warnMessage); } } } -- cgit v1.2.3