Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-12-25 18:47:44 +01:00
Code Issues Projects Releases Wiki Activity

Add option to consider use of an item as a block use at the player's feet.

Browse Source 
Closes WORLDGUARD-3151.
This commit is contained in:
sk89q 2014-08-31 19:30:14 -07:00
parent 59bd11e742
commit cdab004505
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java
View File

@ -182,6 +182,7 @@ public class WorldConfiguration {
public boolean disableObsidianGenerators;
public boolean strictEntitySpawn;
public TargetMatcherSet allowAllInteract;
public TargetMatcherSet blockUseAtFeet;
private Map<String, Integer> maxRegionCounts;
@ -346,6 +347,7 @@ private void loadConfiguration() {
strictEntitySpawn = getBoolean("event-handling.block-entity-spawns-with-untraceable-cause", false);
allowAllInteract = getTargetMatchers("event-handling.interaction-whitelist");
blockUseAtFeet = getTargetMatchers("event-handling.emit-block-use-at-feet");
itemDurability = getBoolean("protection.item-durability", true);
removeInfiniteStacks = getBoolean("protection.remove-infinite-stacks", false);

10
src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java
View File

@ -392,6 +392,16 @@ public void onPlayerInteract(PlayerInteractEvent event) {
event.setUseItemInHand(Result.DENY);
}
// Check for items that the administrator has configured to
// emit a "use block here" event where the player is
// standing, which is a hack to protect items that don't
// throw events
if (item != null && getWorldConfig(player.getWorld()).blockUseAtFeet.test(item)) {
if (Events.fireAndTestCancel(new UseBlockEvent(event, cause, player.getLocation().getBlock()))) {
event.setCancelled(true);
}
}
break;
}
}