Try to fix incompatibility with bumblezone (#498)

CaffeineMC · Jan 17, 2025 · 459de76 · 459de76
1 parent f10a886
commit 459de76
Showing 1 changed file with 20 additions and 4 deletions.
diff --git a/...a/me/jellysquid/mods/lithium/mixin/shapes/lazy_shape_context/EntityShapeContextMixin.java b/...a/me/jellysquid/mods/lithium/mixin/shapes/lazy_shape_context/EntityShapeContextMixin.java
@@ -7,10 +7,7 @@
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import org.jetbrains.annotations.Nullable;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Mutable;
-import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.*;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Constant;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -75,6 +72,25 @@ private void initFields(Entity entity, CallbackInfo ci) {
             at = @At("HEAD")
     )
     public void isHolding(Item item, CallbackInfoReturnable<Boolean> cir) {
+        this.initHeldItem();
+    }
+
+    @Intrinsic
+    public ItemStack getHeldItem() {
+        return this.heldItem;
+    }
+
+    @SuppressWarnings({"UnresolvedMixinReference", "MixinAnnotationTarget"})
+    @Inject(
+            method = "getHeldItem",
+            at = @At("HEAD")
+    )
+    private void initHeldItem(CallbackInfoReturnable<ItemStack> callbackInfoReturnable) {
+        this.initHeldItem();
+    }
+
+    @Unique
+    private void initHeldItem() {
         if (this.heldItem == null) {
             this.heldItem = this.entity instanceof LivingEntity ? ((LivingEntity) this.entity).getMainHandStack() : ItemStack.EMPTY;
         }