Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-01-03 15:08:18 +01:00
Code Issues Projects Releases Wiki Activity

Reduce permissions checks in antibuild.

Browse Source 
Add a little debug logging for those with it enabled.
This commit is contained in:
KHobbits 2012-08-19 21:20:55 +01:00
parent e359e8ab6e
commit fa2a041102
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java
View File

@ -3,6 +3,7 @@ package com.earth2me.essentials.antibuild;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.IEssentials; import com.earth2me.essentials.IEssentials;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import java.util.logging.Level;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.event.Event.Result; import org.bukkit.event.Event.Result;
@ -33,26 +34,25 @@ public class EssentialsAntiBuildListener implements Listener
} }
return metaPermCheck(user, action, block.getTypeId(), block.getData()); return metaPermCheck(user, action, block.getTypeId(), block.getData());
} }
private boolean metaPermCheck(User user, String action, int blockId, byte data) private boolean metaPermCheck(User user, String action, int blockId, byte data)
{ {
String blockPerm = "essentials.build." + action + "." + blockId; final String blockPerm = "essentials.build." + action + "." + blockId;
String dataPerm = blockPerm + ":" + data; final String dataPerm = blockPerm + ":" + data;
if (user.isAuthorized(dataPerm)) if (user.isPermissionSet(dataPerm))
{ {
return true; return user.isAuthorized(dataPerm);
} }
else
if (user.isAuthorized(blockPerm))
{ {
if (user.isPermissionSet(dataPerm) && !user.isAuthorized(dataPerm)) if (ess.getSettings().isDebug())
{ {
return false; ess.getLogger().log(Level.INFO, "abort checking if " + user.getName() + " has " + dataPerm + " - not directly set");
} }
return true;
} }
return false;
return user.isAuthorized(blockPerm);
} }
@EventHandler(priority = EventPriority.HIGHEST) @EventHandler(priority = EventPriority.HIGHEST)
@ -68,6 +68,10 @@ public class EssentialsAntiBuildListener implements Listener
if (prot.getSettingBool(AntiBuildConfig.disable_build) && !user.canBuild() && !user.isAuthorized("essentials.build") if (prot.getSettingBool(AntiBuildConfig.disable_build) && !user.canBuild() && !user.isAuthorized("essentials.build")
&& !metaPermCheck(user, "place", event.getBlock())) && !metaPermCheck(user, "place", event.getBlock()))
{ {
if (ess.getSettings().warnOnBuildDisallow())
{
user.sendMessage(_("buildAlert"));
}
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
@ -100,6 +104,10 @@ public class EssentialsAntiBuildListener implements Listener
if (prot.getSettingBool(AntiBuildConfig.disable_build) && !user.canBuild() && !user.isAuthorized("essentials.build") if (prot.getSettingBool(AntiBuildConfig.disable_build) && !user.canBuild() && !user.isAuthorized("essentials.build")
&& !metaPermCheck(user, "break", event.getBlock())) && !metaPermCheck(user, "break", event.getBlock()))
{ {
if (ess.getSettings().warnOnBuildDisallow())
{
user.sendMessage(_("buildAlert"));
}
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
@ -190,7 +198,6 @@ public class EssentialsAntiBuildListener implements Listener
if (prot.getSettingBool(AntiBuildConfig.disable_use) && !user.canBuild() && !user.isAuthorized("essentials.interact") && !user.isAuthorized("essentials.build")) if (prot.getSettingBool(AntiBuildConfig.disable_use) && !user.canBuild() && !user.isAuthorized("essentials.interact") && !user.isAuthorized("essentials.build"))
{ {
if (!metaPermCheck(user, "interact", event.getClickedBlock())) if (!metaPermCheck(user, "interact", event.getClickedBlock()))
{ {
event.setUseInteractedBlock(Result.DENY); event.setUseInteractedBlock(Result.DENY);
@ -203,8 +210,6 @@ public class EssentialsAntiBuildListener implements Listener
{ {
event.setUseItemInHand(Result.DENY); event.setUseItemInHand(Result.DENY);
} }
} }
} }
} }