Envelope new drop/pickup/craft perms under 'essentials.build'.

This commit is contained in:
KHobbits 2012-09-24 12:48:07 +01:00
parent f2b4bb00b6
commit 22d1db5463

View File

@ -245,12 +245,15 @@ public class EssentialsAntiBuildListener implements Listener
final User user = ess.getUser(entity); final User user = ess.getUser(entity);
final ItemStack item = event.getRecipe().getResult(); final ItemStack item = event.getRecipe().getResult();
if (!metaPermCheck(user, "craft", item.getTypeId(), item.getData().getData())) if (prot.getSettingBool(AntiBuildConfig.disable_use) && !user.canBuild() && !user.isAuthorized("essentials.build"))
{ {
event.setCancelled(true); if (!metaPermCheck(user, "craft", item.getTypeId(), item.getData().getData()))
if (ess.getSettings().warnOnBuildDisallow())
{ {
user.sendMessage(_("antiBuildCraft", item.getType().toString())); event.setCancelled(true);
if (ess.getSettings().warnOnBuildDisallow())
{
user.sendMessage(_("antiBuildCraft", item.getType().toString()));
}
} }
} }
} }
@ -263,12 +266,14 @@ public class EssentialsAntiBuildListener implements Listener
final User user = ess.getUser(event.getPlayer()); final User user = ess.getUser(event.getPlayer());
final ItemStack item = event.getItem().getItemStack(); final ItemStack item = event.getItem().getItemStack();
if (!metaPermCheck(user, "pickup", item.getTypeId(), item.getData().getData())) if (prot.getSettingBool(AntiBuildConfig.disable_use) && !user.canBuild() && !user.isAuthorized("essentials.build"))
{ {
event.setCancelled(true); if (!metaPermCheck(user, "pickup", item.getTypeId(), item.getData().getData()))
event.getItem().setPickupDelay(50); {
event.setCancelled(true);
event.getItem().setPickupDelay(50);
}
} }
} }
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
@ -278,15 +283,17 @@ public class EssentialsAntiBuildListener implements Listener
final User user = ess.getUser(event.getPlayer()); final User user = ess.getUser(event.getPlayer());
final ItemStack item = event.getItemDrop().getItemStack(); final ItemStack item = event.getItemDrop().getItemStack();
if (!metaPermCheck(user, "drop", item.getTypeId(), item.getData().getData())) if (prot.getSettingBool(AntiBuildConfig.disable_use) && !user.canBuild() && !user.isAuthorized("essentials.build"))
{ {
event.setCancelled(true); if (!metaPermCheck(user, "drop", item.getTypeId(), item.getData().getData()))
user.updateInventory();
if (ess.getSettings().warnOnBuildDisallow())
{ {
user.sendMessage(_("antiBuildDrop", item.getType().toString())); event.setCancelled(true);
user.updateInventory();
if (ess.getSettings().warnOnBuildDisallow())
{
user.sendMessage(_("antiBuildDrop", item.getType().toString()));
}
} }
} }
} }
} }