Skip to content

Fix event-itemstack for ComplexRecipe #7674

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

Merged
merged 6 commits into from
Jun 22, 2025
Merged

Fix event-itemstack for ComplexRecipe #7674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8f85619
Fix event-itemstack for ComplexRecipe
ChickChicky Mar 2, 2025
e322db5
Merge branch 'dev/patch' into complexrecipe-itemstack
Burbulinis Jun 9, 2025
4c393cb
Merge branch 'dev/patch' into complexrecipe-itemstack
ChickChicky Jun 19, 2025
32c9afa
Fix inventoryClickedEvent with complexRecipe events
ChickChicky Jun 21, 2025
67b55b3
Merge branch 'dev/patch' into complexrecipe-itemstack
sovdeeth Jun 21, 2025
72d44d2
Fix indendation of line 156 of EvtItem.java
ChickChicky Jun 22, 2025
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
13 changes: 7 additions & 6 deletions src/main/java/ch/njol/skript/classes/data/BukkitEventValues.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,11 +402,7 @@ else if (hand == EquipmentSlot.OFF_HAND)
EventValues.registerEventValue(InventoryClickEvent.class, Player.class,
event -> event.getWhoClicked() instanceof Player player ? player : null);
EventValues.registerEventValue(InventoryClickEvent.class, World.class, event -> event.getWhoClicked().getWorld());
EventValues.registerEventValue(InventoryClickEvent.class, ItemStack.class, event -> {
if (event instanceof CraftItemEvent craftItemEvent)
return craftItemEvent.getRecipe().getResult();
return event.getCurrentItem();
});
EventValues.registerEventValue(InventoryClickEvent.class, ItemStack.class, InventoryClickEvent::getCurrentItem);
EventValues.registerEventValue(InventoryClickEvent.class, Slot.class, event -> {
Inventory invi = event.getClickedInventory(); // getInventory is WRONG and dangerous
if (invi == null)
Expand Down Expand Up @@ -496,7 +492,12 @@ else if (hand == EquipmentSlot.OFF_HAND)
return null;
});
// CraftItemEvent
EventValues.registerEventValue(CraftItemEvent.class, ItemStack.class, event -> event.getRecipe().getResult());
EventValues.registerEventValue(CraftItemEvent.class, ItemStack.class, event -> {
Recipe recipe = event.getRecipe();
if (recipe instanceof ComplexRecipe)
return event.getCurrentItem();
return recipe.getResult();
});
//InventoryEvent
EventValues.registerEventValue(InventoryEvent.class, Inventory.class, InventoryEvent::getInventory);
//InventoryOpenEvent
Expand Down
8 changes: 7 additions & 1 deletion src/main/java/ch/njol/skript/events/EvtItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.bukkit.event.player.PlayerDropItemEvent;
import org.bukkit.event.player.PlayerItemConsumeEvent;
import org.bukkit.event.player.PlayerPickupItemEvent;
import org.bukkit.inventory.ComplexRecipe;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.Recipe;
import org.jetbrains.annotations.Nullable;
Expand Down Expand Up @@ -161,7 +162,12 @@ public boolean check(final Event event) {
} else if (event instanceof EntityDropItemEvent entityDropItemEvent) {
itemStack = entityDropItemEvent.getItemDrop().getItemStack();
} else if (event instanceof CraftItemEvent craftItemEvent) {
itemStack = craftItemEvent.getRecipe().getResult();
Recipe recipe = craftItemEvent.getRecipe();
if (recipe instanceof ComplexRecipe) {
itemStack = craftItemEvent.getCurrentItem();
} else {
itemStack = recipe.getResult();
}
} else if (event instanceof PrepareItemCraftEvent prepareItemCraftEvent) {
Recipe recipe = prepareItemCraftEvent.getRecipe();
if (recipe != null) {
Expand Down