Fix inventory closing

Author: aromaa

src/mixins/java/org/spongepowered/common/mixin/inventory/event/server/level/ServerPlayerMixin_Inventory.java

@@ -249,4 +249,15 @@ public abstract class ServerPlayerMixin_Inventory extends PlayerMixin_Inventory
         }
         throw new IllegalStateException("Unknown Lens for Player Inventory: " + lens.getClass().getName());
     }
+
+    @Redirect(method = "doCloseContainer",
+        at = @At(value = "INVOKE", target = "Lnet/minecraft/world/inventory/AbstractContainerMenu;removed(Lnet/minecraft/world/entity/player/Player;)V"))
+    private void impl$onHandleContainerClose(final AbstractContainerMenu instance, final Player player) {
+        final PhaseContext<@NonNull ?> context = PhaseTracker.SERVER.getPhaseContext();
+        final TransactionalCaptureSupplier transactor = context.getTransactor();
+        try (final EffectTransactor ignored = transactor.logCloseInventory(player, true)) {
+            instance.removed(player);
+            instance.broadcastChanges();
+        }
+    }
 }

src/mixins/java/org/spongepowered/common/mixin/inventory/event/server/network/ServerGamePacketListenerImplMixin_Inventory.java

@@ -130,17 +130,6 @@ public class ServerGamePacketListenerImplMixin_Inventory {
         // TrackingUtil.processBlockCaptures called by UseItemPacketState
     }
 
-    @Redirect(method = "handleContainerClose",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerPlayer;doCloseContainer()V"))
-    private void impl$onHandleContainerClose(final ServerPlayer player) {
-        final PhaseContext<@NonNull ?> context = PhaseTracker.SERVER.getPhaseContext();
-        final TransactionalCaptureSupplier transactor = context.getTransactor();
-        try (final EffectTransactor ignored = transactor.logCloseInventory(player, true)) {
-            this.player.containerMenu.removed(player);
-            this.player.containerMenu.broadcastChanges();
-        }
-    }
-
     @Redirect(method = "handleRenameItem(Lnet/minecraft/network/protocol/game/ServerboundRenameItemPacket;)V",
             at = @At(value = "INVOKE", target = "Lnet/minecraft/world/inventory/AnvilMenu;setItemName(Ljava/lang/String;)Z"))
     private boolean impl$onHandleRenameItem(final AnvilMenu menu, final String name) {