Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2025-01-13 19:51:46 +01:00
Code Issues Projects Releases Wiki Activity

Added config option to ignore hoppers moving items.

Browse Source 
Defaults to old behavior (false).
This commit is contained in:
wizjany 2017-10-14 14:41:58 -04:00
parent f76259df82
commit 95b88ea64b
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java
View File

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

4
worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java
View File

@ -794,6 +794,10 @@ public void onInventoryMoveItem(InventoryMoveItemEvent event) {
InventoryHolder sourceHolder = event.getSource().getHolder(); InventoryHolder sourceHolder = event.getSource().getHolder();
InventoryHolder targetHolder = event.getDestination().getHolder(); InventoryHolder targetHolder = event.getDestination().getHolder();
if (causeHolder instanceof Hopper && getPlugin().getGlobalStateManager().get(((Hopper) causeHolder).getWorld()).ignoreHopperMoveEvents) {
return;
}
Entry entry; Entry entry;
if ((entry = moveItemDebounce.tryDebounce(event)) != null) { if ((entry = moveItemDebounce.tryDebounce(event)) != null) {