Merge remote-tracking branch 'origin/master-1.19-lts' into master-1.20

CyclopsMC · Sep 24, 2023 · 15b01ab · 15b01ab
2 parents ac6fba9 + 03a6628
commit 15b01ab
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/resources/changelog/1.18.2-1.16.1.txt b/resources/changelog/1.18.2-1.16.1.txt
@@ -0,0 +1,6 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.17.0 or higher.
+
+Fixes:
+* Fix held items vanishing after gui close, Closes #1308
+
diff --git a/resources/changelog/1.19.2-1.19.1.txt b/resources/changelog/1.19.2-1.19.1.txt
@@ -0,0 +1,6 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.18.2 or higher.
+
+Fixes:
+* Fix held items vanishing after gui close, Closes #1308
+
diff --git a/...va/org/cyclops/integrateddynamics/core/inventory/container/ContainerMultipartAspects.java b/...va/org/cyclops/integrateddynamics/core/inventory/container/ContainerMultipartAspects.java
@@ -122,6 +122,7 @@ protected Container constructInputSlotsInventory() {
 
     @Override
     public void removed(Player player) {
+        super.removed(player);
         if (inputSlots instanceof SimpleInventory) {
             ((SimpleInventory) inputSlots).removeDirtyMarkListener(this);
         }

diff --git a/.../org/cyclops/integrateddynamics/inventory/container/ContainerPartPanelVariableDriven.java b/.../org/cyclops/integrateddynamics/inventory/container/ContainerPartPanelVariableDriven.java
@@ -1,6 +1,7 @@
 package org.cyclops.integrateddynamics.inventory.container;
 
 import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.Container;
@@ -122,6 +123,7 @@ public void onDirty() {
 
     @Override
     public void removed(Player player) {
+        super.removed(player);
         if (inventory instanceof SimpleInventory) {
             ((SimpleInventory) inventory).removeDirtyMarkListener(this);
         }