Skip to content

Fix: Always emit InventoryPickupItemEvent in suction module #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Distolfix wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: Always emit InventoryPickupItemEvent in suction module #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions ...rs-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleSuction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,9 @@ public void run(Hopper hopper, StorageContainerCache.Cache hopperCache) {

boolean filterEndpoint = hopper.getFilter().getEndPoint() != null;

Inventory hopperInventory = null;
if (Settings.EMIT_INVENTORYPICKUPITEMEVENT.getBoolean()) {
InventoryHolder inventoryHolder = (InventoryHolder) hopper.getBlock().getState();
hopperInventory = Bukkit.createInventory(inventoryHolder, InventoryType.HOPPER);
}
// Always create inventory for the suction module to allow plugins to cancel the pickup event
InventoryHolder inventoryHolder = (InventoryHolder) hopper.getBlock().getState();
Inventory hopperInventory = Bukkit.createInventory(inventoryHolder, InventoryType.HOPPER);

for (Item item : itemsToSuck) {
ItemStack itemStack = item.getItemStack();
Expand Down Expand Up @@ -122,13 +120,13 @@ public void run(Hopper hopper, StorageContainerCache.Cache hopperCache) {
}
}

if (Settings.EMIT_INVENTORYPICKUPITEMEVENT.getBoolean()) {
hopperInventory.setContents(hopperCache.cachedInventory);
InventoryPickupItemEvent pickupEvent = new InventoryPickupItemEvent(hopperInventory, item);
Bukkit.getPluginManager().callEvent(pickupEvent);
if (pickupEvent.isCancelled()) {
continue;
}
// Always emit the event for suction module to allow any plugin to prevent item pickup
// This is important because suction is an aggressive collection mechanism
hopperInventory.setContents(hopperCache.cachedInventory);
InventoryPickupItemEvent pickupEvent = new InventoryPickupItemEvent(hopperInventory, item);
Bukkit.getPluginManager().callEvent(pickupEvent);
if (pickupEvent.isCancelled()) {
continue;
}

// try to add the items to the hopper
Expand Down