Convert container owner capture to a stack.

Author: InitAuther97

arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftHumanEntityMixin.java

@@ -1,17 +1,18 @@
 package io.izzel.arclight.common.mixin.bukkit;
 
 import io.izzel.arclight.common.mod.util.ArclightCaptures;
+import io.izzel.arclight.mixin.Decorate;
+import io.izzel.arclight.mixin.DecorationOps;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.AbstractContainerMenu;
 import org.bukkit.craftbukkit.v.CraftServer;
 import org.bukkit.craftbukkit.v.entity.CraftEntity;
 import org.bukkit.craftbukkit.v.entity.CraftHumanEntity;
 import org.bukkit.inventory.InventoryView;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(value = CraftHumanEntity.class, remap = false)
 public abstract class CraftHumanEntityMixin extends CraftEntity {
@@ -25,14 +26,15 @@ public CraftHumanEntityMixin(CraftServer server, Entity entity) {
         super(server, entity);
     }
 
-    @Inject(method = "getOpenInventory", at = @At("HEAD"))
-    private void arclight$capturePlayer(CallbackInfoReturnable<InventoryView> cir) {
-        ArclightCaptures.captureContainerOwner(this.getHandle());
-    }
-
-    @Inject(method = "getOpenInventory", at = @At("RETURN"))
-    private void arclight$resetPlayer(CallbackInfoReturnable<InventoryView> cir) {
-        ArclightCaptures.resetContainerOwner();
+    @Decorate(method = "getOpenInventory", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/inventory/AbstractContainerMenu;getBukkitView()Lorg/bukkit/inventory/InventoryView;"))
+    private InventoryView arclight$capturePlayer(AbstractContainerMenu instance) throws Throwable {
+        Player handle = getHandle();
+        try {
+            ArclightCaptures.captureContainerOwner(handle);
+            return (InventoryView) DecorationOps.callsite().invoke(instance);
+        } finally {
+            ArclightCaptures.popContainerOwner(handle);
+        }
     }
 
     @Override

arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerGamePacketListenerImplMixin.java

@@ -162,7 +162,6 @@
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
-import java.util.function.Function;
 import java.util.logging.Level;
 
 @Mixin(ServerGamePacketListenerImpl.class)
@@ -1252,9 +1251,14 @@ public void handleContainerClick(ServerboundContainerClickPacket packet) {
                     return;
                 }
 
-                ArclightCaptures.captureContainerOwner(this.player);
-                InventoryView inventory = ((ContainerBridge) this.player.containerMenu).bridge$getBukkitView();
-                ArclightCaptures.resetContainerOwner();
+                ServerPlayer owner = this.player;
+                InventoryView inventory;
+                try {
+                    ArclightCaptures.captureContainerOwner(owner);
+                    inventory = ((ContainerBridge) this.player.containerMenu).bridge$getBukkitView();
+                } finally {
+                    ArclightCaptures.popContainerOwner(owner);
+                }
                 InventoryType.SlotType type = inventory.getSlotType(packet.getSlotNum());
 
                 InventoryClickEvent event;

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

@@ -614,7 +614,7 @@ private Either<Player.BedSleepingProblem, Unit> getBedResult(BlockPos blockposit
             boolean cancelled = false;
             ArclightCaptures.captureContainerOwner((ServerPlayer) (Object) this);
             container = CraftEventFactory.callInventoryOpenEvent((ServerPlayer) (Object) this, container, cancelled);
-            ArclightCaptures.resetContainerOwner();
+            ArclightCaptures.popContainerOwner((ServerPlayer) (Object) this);
             if (container == null && !cancelled) {
                 if (iTileInventory instanceof Container) {
                     ((Container) iTileInventory).stopOpen((ServerPlayer) (Object) this);
@@ -648,10 +648,9 @@ 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) {
-            var old = ArclightCaptures.getContainerOwner();
             ArclightCaptures.captureContainerOwner((ServerPlayer) (Object) this);
             CraftEventFactory.handleInventoryCloseEvent((ServerPlayer) (Object) this);
-            ArclightCaptures.captureContainerOwner(old);
+            ArclightCaptures.popContainerOwner((ServerPlayer) (Object) this);
         }
     }
 

arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightCaptures.java

@@ -225,18 +225,20 @@ public static BlockPos getDamageEventBlock() {
         }
     }
 
-    private static transient Player containerOwner;
+    private static transient Stack<Player> containerOwner = new Stack<>();
 
     public static void captureContainerOwner(Player entity) {
-        containerOwner = entity;
+        containerOwner.push(entity);
     }
 
     public static Player getContainerOwner() {
-        return containerOwner;
+        return containerOwner.peek();
     }
 
-    public static void resetContainerOwner() {
-        containerOwner = null;
+    public static void popContainerOwner(Player entity) {
+        if (!containerOwner.empty() && entity == getContainerOwner()) {
+            containerOwner.pop();
+        }
     }
 
     private static transient CraftPortalEvent craftPortalEvent;

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

@@ -49,7 +49,7 @@ default void openMenu(MenuProvider containerSupplier, Consumer<FriendlyByteBuf>
         ((ContainerBridge) c).bridge$setTitle(containerSupplier.getDisplayName());
         ArclightCaptures.captureContainerOwner(player);
         c = CraftEventFactory.callInventoryOpenEvent(player, c);
-        ArclightCaptures.resetContainerOwner();
+        ArclightCaptures.popContainerOwner(player);
         if (c == null) {
             if (containerSupplier instanceof Container) {
                 ((Container) containerSupplier).stopOpen(player);