Skip to content

Fix for Elite Crafting Table eating items. #433 #434

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
nustad10 wants to merge 2 commits into
base: v-4.19
Choose a base branch
from
Open

Fix for Elite Crafting Table eating items. #433 #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0446345
Handle player quit and kick events to return items
nustad10 Dec 14, 2025
ab27f32
Cancelled double click interactions on elite crafting table
nustad10 Dec 14, 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
6 changes: 6 additions & 0 deletions spigot/src/main/java/me/wolfyscript/customcrafting/gui/elite_crafting/CraftingWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,12 @@
import me.wolfyscript.utilities.api.inventory.gui.button.CallbackButtonRender;
import me.wolfyscript.utilities.api.inventory.gui.button.buttons.DummyButton;
import me.wolfyscript.utilities.api.nms.inventory.GUIInventory;
import me.wolfyscript.utilities.util.inventory.ItemUtils;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.inventory.InventoryView;
import org.bukkit.inventory.ItemStack;
Expand Down Expand Up @@ -108,6 +110,10 @@ public void onInit() {
return true;
}
CacheEliteCraftingTable cacheEliteCraftingTable = cache.getEliteWorkbench();
if (event instanceof InventoryClickEvent clickEvent && clickEvent.getClick().equals(ClickType.DOUBLE_CLICK)) {
clickEvent.setCancelled(true);
return true;
}
if (cacheEliteCraftingTable.getContents() != null) {
return InteractionUtils.applyItemFromInteractionEvent(slot, event, CRAFTING_SLOTS_MAP.get(cacheEliteCraftingTable.getCurrentGridSize()), itemStack -> cacheEliteCraftingTable.getContents()[recipeSlot] = itemStack);
}
Expand Down
32 changes: 32 additions & 0 deletions spigot/src/main/java/me/wolfyscript/customcrafting/listeners/PlayerListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,19 @@

import me.wolfyscript.customcrafting.CustomCrafting;
import me.wolfyscript.customcrafting.configs.customitem.RecipeBookSettings;
import me.wolfyscript.customcrafting.data.CCCache;
import me.wolfyscript.customcrafting.utils.ItemLoader;
import me.wolfyscript.customcrafting.utils.PlayerUtil;
import me.wolfyscript.utilities.api.inventory.custom_items.CustomItem;
import me.wolfyscript.utilities.util.inventory.ItemUtils;
import org.bukkit.Material;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.block.Action;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerKickEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.inventory.ItemStack;

public class PlayerListener implements Listener {
Expand All @@ -57,6 +62,16 @@ public void onJoin(PlayerJoinEvent event) {
customCrafting.getUpdateChecker().run(player);
}
}

@EventHandler
public void onQuit(PlayerQuitEvent event) {
returnEliteWorkbenchItems(event.getPlayer());
}

@EventHandler
public void onKick(PlayerKickEvent event) {
returnEliteWorkbenchItems(event.getPlayer());
}

@EventHandler
public void onClick(PlayerInteractEvent event) {
Expand All @@ -71,4 +86,21 @@ public void onClick(PlayerInteractEvent event) {
}
}
}
private void returnEliteWorkbenchItems(org.bukkit.entity.Player player) {
var guiHandler = customCrafting.getApi().getInventoryAPI(CCCache.class).getGuiHandler(player);
var cacheEliteCraftingTable = guiHandler.getCustomCache().getEliteWorkbench();
if (cacheEliteCraftingTable.getContents() == null) return;

for (ItemStack itemStack : cacheEliteCraftingTable.getContents()) {
if (!ItemUtils.isAirOrNull(itemStack)) {
var remaining = player.getInventory().addItem(itemStack).values();
remaining.forEach(stack -> player.getWorld().dropItem(player.getLocation(), stack));
}
}
cacheEliteCraftingTable.setCustomItem(null);
cacheEliteCraftingTable.setSettings(null);
cacheEliteCraftingTable.setResult(new ItemStack(Material.AIR));
cacheEliteCraftingTable.setContents(null);
cacheEliteCraftingTable.setCurrentGridSize((byte) 0);
}
}