Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-02-22 23:31:37 +01:00
Code Issues Projects Releases Wiki Activity

Call InventoryPreClickEvent even without any inventory condition

Browse Source
This commit is contained in:
Felix Cravic 2020-08-13 19:14:07 +02:00
parent 23e82e0ae2
commit ef28720496
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/net/minestom/server/inventory/click/InventoryClickProcessor.java
View File

@ -518,10 +518,8 @@ public class InventoryClickProcessor {
// Wait for inventory conditions + events to possibly close the inventory // Wait for inventory conditions + events to possibly close the inventory
player.UNSAFE_changeDidCloseInventory(false); player.UNSAFE_changeDidCloseInventory(false);
final List<InventoryCondition> inventoryConditions = isPlayerInventory ? // PreClickEvent
player.getInventory().getInventoryConditions() : inventory.getInventoryConditions(); {
if (!inventoryConditions.isEmpty()) {
InventoryPreClickEvent inventoryPreClickEvent = new InventoryPreClickEvent(player, inventory, slot, clickType, clicked, cursor); InventoryPreClickEvent inventoryPreClickEvent = new InventoryPreClickEvent(player, inventory, slot, clickType, clicked, cursor);
player.callEvent(InventoryPreClickEvent.class, inventoryPreClickEvent); player.callEvent(InventoryPreClickEvent.class, inventoryPreClickEvent);
cursor = inventoryPreClickEvent.getCursorItem(); cursor = inventoryPreClickEvent.getCursorItem();
@ -531,6 +529,12 @@ public class InventoryClickProcessor {
if (inventoryPreClickEvent.isCancelled()) { if (inventoryPreClickEvent.isCancelled()) {
clickResult.setRefresh(true); clickResult.setRefresh(true);
} }
}
// Inventory conditions
final List<InventoryCondition> inventoryConditions = isPlayerInventory ?
player.getInventory().getInventoryConditions() : inventory.getInventoryConditions();
if (!inventoryConditions.isEmpty()) {
for (InventoryCondition inventoryCondition : inventoryConditions) { for (InventoryCondition inventoryCondition : inventoryConditions) {
InventoryConditionResult result = new InventoryConditionResult(clicked, cursor); InventoryConditionResult result = new InventoryConditionResult(clicked, cursor);