TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-11 20:00:46 +00:00
Code Issues Projects Releases Wiki Activity

Use durability instead of itemdata for antibuild checks.

Browse source 
Fixes potion blocking using antibuild.
This commit is contained in:
KHobbits 2012-11-04 18:02:36 +00:00
parent 10244d5f90
commit 587f532991
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java
View file

@ -51,7 +51,7 @@ public class EssentialsAntiBuildListener implements Listener
return user.isAuthorized(blockPerm); return user.isAuthorized(blockPerm);
} }
private boolean metaPermCheck(final User user, final String action, final int blockId, final byte data) private boolean metaPermCheck(final User user, final String action, final int blockId, final short data)
{ {
final String blockPerm = "essentials.build." + action + "." + blockId; final String blockPerm = "essentials.build." + action + "." + blockId;
final String dataPerm = blockPerm + ":" + data; final String dataPerm = blockPerm + ":" + data;
@ -219,7 +219,7 @@ public class EssentialsAntiBuildListener implements Listener
if (prot.getSettingBool(AntiBuildConfig.disable_use) && !user.canBuild() && !user.isAuthorized("essentials.build")) if (prot.getSettingBool(AntiBuildConfig.disable_use) && !user.canBuild() && !user.isAuthorized("essentials.build"))
{ {
if (event.hasItem() && !metaPermCheck(user, "interact", item.getTypeId(), item.getData().getData())) if (event.hasItem() && !metaPermCheck(user, "interact", item.getTypeId(), item.getDurability()))
{ {
event.setCancelled(true); event.setCancelled(true);
if (ess.getSettings().warnOnBuildDisallow()) if (ess.getSettings().warnOnBuildDisallow())
@ -251,7 +251,7 @@ public class EssentialsAntiBuildListener implements Listener
if (prot.getSettingBool(AntiBuildConfig.disable_use) && !user.canBuild() && !user.isAuthorized("essentials.build")) if (prot.getSettingBool(AntiBuildConfig.disable_use) && !user.canBuild() && !user.isAuthorized("essentials.build"))
{ {
if (!metaPermCheck(user, "craft", item.getTypeId(), item.getData().getData())) if (!metaPermCheck(user, "craft", item.getTypeId(), item.getDurability()))
{ {
event.setCancelled(true); event.setCancelled(true);
if (ess.getSettings().warnOnBuildDisallow()) if (ess.getSettings().warnOnBuildDisallow())
@ -272,7 +272,7 @@ public class EssentialsAntiBuildListener implements Listener
if (prot.getSettingBool(AntiBuildConfig.disable_use) && !user.canBuild() && !user.isAuthorized("essentials.build")) if (prot.getSettingBool(AntiBuildConfig.disable_use) && !user.canBuild() && !user.isAuthorized("essentials.build"))
{ {
if (!metaPermCheck(user, "pickup", item.getTypeId(), item.getData().getData())) if (!metaPermCheck(user, "pickup", item.getTypeId(), item.getDurability()))
{ {
event.setCancelled(true); event.setCancelled(true);
event.getItem().setPickupDelay(50); event.getItem().setPickupDelay(50);
@ -289,7 +289,7 @@ public class EssentialsAntiBuildListener implements Listener
if (prot.getSettingBool(AntiBuildConfig.disable_use) && !user.canBuild() && !user.isAuthorized("essentials.build")) if (prot.getSettingBool(AntiBuildConfig.disable_use) && !user.canBuild() && !user.isAuthorized("essentials.build"))
{ {
if (!metaPermCheck(user, "drop", item.getTypeId(), item.getData().getData())) if (!metaPermCheck(user, "drop", item.getTypeId(), item.getDurability()))
{ {
event.setCancelled(true); event.setCancelled(true);
user.updateInventory(); user.updateInventory();