fix: Fix trash slot being accessible in spectator mode #126

TwelveIterationMods · Sep 13, 2023 · 6778692 · 6778692
1 parent 5ae66bc
commit 6778692
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/shared/src/main/java/net/blay09/mods/trashslot/client/TrashSlotGuiHandler.java b/shared/src/main/java/net/blay09/mods/trashslot/client/TrashSlotGuiHandler.java
@@ -55,6 +55,11 @@ private static void onScreenInit(ScreenInitEvent.Post event) {
             return;
         }
 
+        Player player = Minecraft.getInstance().player;
+        if (player != null && player.isSpectator()) {
+            return;
+        }
+
         if (event.getScreen() instanceof CreativeModeInventoryScreen) {
             currentContainerSettings = ContainerSettings.NONE;
             trashSlotComponent = null;
@@ -70,7 +75,7 @@ private static void onScreenInit(ScreenInitEvent.Post event) {
             }
 
             // For some reason this event gets fired with GuiInventory right after opening the creative menu, AFTER it got fired for GuiContainerCreative
-            if (screen instanceof InventoryScreen && Minecraft.getInstance().player.getAbilities().instabuild) {
+            if (screen instanceof InventoryScreen && player != null && player.getAbilities().instabuild) {
                 return;
             }
 

diff --git a/shared/src/main/java/net/blay09/mods/trashslot/network/MessageDeleteFromSlot.java b/shared/src/main/java/net/blay09/mods/trashslot/network/MessageDeleteFromSlot.java
@@ -35,6 +35,10 @@ public static MessageDeleteFromSlot decode(final FriendlyByteBuf buf) {
     }
 
     public static void handle(ServerPlayer player, MessageDeleteFromSlot message) {
+        if (player.isSpectator()) {
+            return;
+        }
+
         if (message.slotNumber == -1) {
             TrashHelper.setTrashItem(player, ItemStack.EMPTY);
             Balm.getNetworking().reply(new MessageTrashSlotContent(ItemStack.EMPTY));

diff --git a/shared/src/main/java/net/blay09/mods/trashslot/network/MessageTrashSlotClick.java b/shared/src/main/java/net/blay09/mods/trashslot/network/MessageTrashSlotClick.java
@@ -27,6 +27,10 @@ public static MessageTrashSlotClick decode(FriendlyByteBuf buf) {
     }
 
     public static void handle(ServerPlayer player, MessageTrashSlotClick message) {
+        if (player.isSpectator()) {
+            return;
+        }
+
         ItemStack actualMouseItem = player.containerMenu.getCarried();
         if (ItemStack.matches(actualMouseItem, message.itemStack)) {
             if (actualMouseItem.isEmpty()) {