Ensure container owner is always popped.

Author: InitAuther97

arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ServerPlayerMixin.java

@@ -601,9 +601,12 @@ private Either<Player.BedSleepingProblem, Unit> getBedResult(BlockPos blockposit
         if (container != null) {
             ((ContainerBridge) container).bridge$setTitle(iTileInventory.getDisplayName());
             boolean cancelled = false;
-            ArclightCaptures.captureContainerOwner((ServerPlayer) (Object) this);
-            container = CraftEventFactory.callInventoryOpenEvent((ServerPlayer) (Object) this, container, cancelled);
-            ArclightCaptures.popContainerOwner((ServerPlayer) (Object) this);
+            try {
+                ArclightCaptures.captureContainerOwner((ServerPlayer) (Object) this);
+                container = CraftEventFactory.callInventoryOpenEvent((ServerPlayer) (Object) this, container, cancelled);
+            } finally {
+                ArclightCaptures.popContainerOwner((ServerPlayer) (Object) this);
+            }
             if (container == null && !cancelled) {
                 if (iTileInventory instanceof Container) {
                     ((Container) iTileInventory).stopOpen((ServerPlayer) (Object) this);
@@ -637,9 +640,12 @@ private Either<Player.BedSleepingProblem, Unit> getBedResult(BlockPos blockposit
     @Inject(method = "doCloseContainer", at = @At("HEAD"))
     private void arclight$invClose(CallbackInfo ci) {
         if (this.containerMenu != this.inventoryMenu) {
-            ArclightCaptures.captureContainerOwner((ServerPlayer) (Object) this);
-            CraftEventFactory.handleInventoryCloseEvent((ServerPlayer) (Object) this);
-            ArclightCaptures.popContainerOwner((ServerPlayer) (Object) this);
+            try {
+                ArclightCaptures.captureContainerOwner((ServerPlayer) (Object) this);
+                CraftEventFactory.handleInventoryCloseEvent((ServerPlayer) (Object) this);
+            } finally {
+                ArclightCaptures.popContainerOwner((ServerPlayer) (Object) this);
+            }
         }
     }
 

arclight-forge/src/main/java/io/izzel/arclight/forge/mixin/forge/IForgeServerPlayerMixin.java

@@ -47,9 +47,12 @@ default void openMenu(MenuProvider containerSupplier, Consumer<FriendlyByteBuf>
             return;
 
         ((ContainerBridge) c).bridge$setTitle(containerSupplier.getDisplayName());
-        ArclightCaptures.captureContainerOwner(player);
-        c = CraftEventFactory.callInventoryOpenEvent(player, c);
-        ArclightCaptures.popContainerOwner(player);
+        try {
+            ArclightCaptures.captureContainerOwner(player);
+            c = CraftEventFactory.callInventoryOpenEvent(player, c);
+        } finally {
+            ArclightCaptures.popContainerOwner(player);
+        }
         if (c == null) {
             if (containerSupplier instanceof Container) {
                 ((Container) containerSupplier).stopOpen(player);