From e4ee5b7894f31bced922ff73f11d57208c68d59e Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Sun, 22 Nov 2020 11:14:40 +0800 Subject: [PATCH] Fix wrong patches for water lily placing (#82) --- .../arclight/common/mixin/core/item/BlockItemMixin.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/BlockItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/BlockItemMixin.java index 69cab4ee..3b905cbe 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/BlockItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/BlockItemMixin.java @@ -6,6 +6,7 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.BlockItem; import net.minecraft.item.BlockItemUseContext; +import net.minecraft.item.LilyPadItem; import net.minecraft.nbt.CompoundNBT; import net.minecraft.state.Property; import net.minecraft.state.StateContainer; @@ -41,7 +42,9 @@ public abstract class BlockItemMixin { @Inject(method = "tryPlace", locals = LocalCapture.CAPTURE_FAILHARD, at = @At(value = "INVOKE", shift = At.Shift.AFTER, target = "Lnet/minecraft/item/BlockItem;getStateForPlacement(Lnet/minecraft/item/BlockItemUseContext;)Lnet/minecraft/block/BlockState;")) private void arclight$prePlaceLilypad(BlockItemUseContext context, CallbackInfoReturnable cir, BlockItemUseContext context1) { - this.arclight$state = CraftBlockState.getBlockState(context1.getWorld(), context1.getPos()); + if ((Object) this instanceof LilyPadItem) { + this.arclight$state = CraftBlockState.getBlockState(context1.getWorld(), context1.getPos()); + } } @Inject(method = "tryPlace", locals = LocalCapture.CAPTURE_FAILHARD, cancellable = true,