I believe this is a better fix for Cannot copy null stack in Bukkit.

Signed-off-by: 秋雨落 <i@rain.cx>
IzzelAliz · Nov 17, 2024 · 0490af1 · 0490af1
1 parent 4b290e2
commit 0490af1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/...on/src/main/java/io/izzel/arclight/common/mixin/bukkit/inventory/CraftItemStackMixin.java b/...on/src/main/java/io/izzel/arclight/common/mixin/bukkit/inventory/CraftItemStackMixin.java
@@ -0,0 +1,15 @@
+package io.izzel.arclight.common.mixin.bukkit.inventory;
+
+import net.minecraft.world.item.ItemStack;
+import org.bukkit.craftbukkit.v.inventory.CraftItemStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(CraftItemStack.class)
+public abstract class CraftItemStackMixin {
+    @Redirect(method = "asCraftMirror", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/ItemStack;isEmpty()Z"))
+    private static boolean arclight$asCraftMirror$ItemStack$isEmpty(ItemStack instance) {
+        return false;
+    }
+}
diff --git a/arclight-common/src/main/resources/mixins.arclight.bukkit.json b/arclight-common/src/main/resources/mixins.arclight.bukkit.json
@@ -45,6 +45,7 @@
     "Registry_SimpleRegistryMixin",
     "StandardMessengerMixin",
     "WatchdogThreadMixin",
+    "inventory.CraftItemStackMixin",
     "util.BlockStateListPopulatorMixin",
     "util.DelegatedGeneratorAccessMixin",
     "util.DummyGeneratorAccessMixin"

diff --git a/...c/main/java/io/izzel/arclight/neoforge/mixin/core/world/item/ItemStackMixin_NeoForge.java b/...c/main/java/io/izzel/arclight/neoforge/mixin/core/world/item/ItemStackMixin_NeoForge.java
@@ -40,9 +40,6 @@ public abstract class ItemStackMixin_NeoForge implements ItemStackBridge, IItemS
     @Decorate(method = "hurtAndBreak(ILnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;Ljava/util/function/Consumer;)V",
             at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/enchantment/EnchantmentHelper;processDurabilityChange(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/item/ItemStack;I)I"))
     private int arclight$itemDamage(ServerLevel serverLevel, ItemStack itemStack, int i, @Local(ordinal = 0) LivingEntity damager) throws Throwable {
-        if (itemStack == null) {
-            itemStack = ItemStack.EMPTY;
-        }
         int result = (int) DecorationOps.callsite().invoke(serverLevel, itemStack, i);
         if (damager instanceof ServerPlayer) {
             PlayerItemDamageEvent event = new PlayerItemDamageEvent(((ServerPlayerEntityBridge) damager).bridge$getBukkitEntity(), CraftItemStack.asCraftMirror((ItemStack) (Object) this), result);