Skip to content

Commit 7d7e0b0

Browse files
Don't add slot pdc entry to window items
This seems to no longer be necessary, presumably due to the switch to packet-based inventories
1 parent dc71a51 commit 7d7e0b0

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

invui/src/main/java/xyz/xenondevs/invui/window/AbstractWindow.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,14 @@
44
import net.kyori.adventure.text.Component;
55
import net.kyori.adventure.text.minimessage.MiniMessage;
66
import org.bukkit.GameMode;
7-
import org.bukkit.NamespacedKey;
87
import org.bukkit.entity.Player;
98
import org.bukkit.event.inventory.ClickType;
109
import org.bukkit.event.inventory.InventoryCloseEvent;
1110
import org.bukkit.inventory.ItemStack;
12-
import org.bukkit.persistence.PersistentDataType;
1311
import org.jetbrains.annotations.ApiStatus;
1412
import org.jspecify.annotations.Nullable;
1513
import xyz.xenondevs.invui.Click;
1614
import xyz.xenondevs.invui.ClickEvent;
17-
import xyz.xenondevs.invui.InvUI;
1815
import xyz.xenondevs.invui.gui.AbstractGui;
1916
import xyz.xenondevs.invui.gui.Gui;
2017
import xyz.xenondevs.invui.gui.SlotElement;
@@ -46,7 +43,6 @@ public sealed abstract class AbstractWindow<M extends CustomContainerMenu>
4643
permits AbstractMergedWindow, AbstractSplitWindow
4744
{
4845

49-
private static final NamespacedKey SLOT_KEY = new NamespacedKey(InvUI.getInstance().getPlugin(), "slot");
5046
private static final ThreadLocal<Boolean> isInOpeningContext = ThreadLocal.withInitial(() -> false);
5147
private static final ThreadLocal<Integer> isInCloseHandlerContext = ThreadLocal.withInitial(() -> 0);
5248

@@ -100,13 +96,6 @@ protected void update(int slot) {
10096
SlotElement holdingElement = newPath.getLast().getHoldingElement();
10197
if (holdingElement != null) {
10298
itemStack = holdingElement.getItemStack(getViewer());
103-
if (itemStack != null && holdingElement instanceof SlotElement.Item) {
104-
// This makes every item unique to prevent Shift-DoubleClick "clicking" multiple items at the same time.
105-
itemStack = itemStack.clone(); // clone ItemStack in order to not modify the original
106-
itemStack.editMeta(meta ->
107-
meta.getPersistentDataContainer().set(SLOT_KEY, PersistentDataType.BYTE, (byte) slot)
108-
);
109-
}
11099
} else { // holding element is null
111100
// background by gui
112101
itemStack = newPath.reversed().stream()

0 commit comments

Comments
 (0)