From 59fb47a0a7dad9466e50b2d5f0929dc39492cb17 Mon Sep 17 00:00:00 2001 From: Alexthe668 Date: Sun, 20 Oct 2024 09:08:22 -0700 Subject: [PATCH] fix #1253 fix #1242 --- .../server/block/blockentity/ConversionCrucibleBlockEntity.java | 1 + .../alexscaves/server/entity/item/CandyCaneHookEntity.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/github/alexmodguy/alexscaves/server/block/blockentity/ConversionCrucibleBlockEntity.java b/src/main/java/com/github/alexmodguy/alexscaves/server/block/blockentity/ConversionCrucibleBlockEntity.java index 54ff04f02..e75dc8271 100644 --- a/src/main/java/com/github/alexmodguy/alexscaves/server/block/blockentity/ConversionCrucibleBlockEntity.java +++ b/src/main/java/com/github/alexmodguy/alexscaves/server/block/blockentity/ConversionCrucibleBlockEntity.java @@ -168,6 +168,7 @@ public static void tick(Level level, BlockPos pos, BlockState state, ConversionC entity.setConvertingToBiome(BiomeTreatItem.getCaveBiome(item.getItem())); entity.setFilledLevel(1); entity.rerollWantedItem(); + item.getItem().shrink(1); flag = true; } else if (item.getItem().is(entity.wantStack.getItem())) { flag = true; diff --git a/src/main/java/com/github/alexmodguy/alexscaves/server/entity/item/CandyCaneHookEntity.java b/src/main/java/com/github/alexmodguy/alexscaves/server/entity/item/CandyCaneHookEntity.java index 2d3ebf5f0..cdedd337f 100644 --- a/src/main/java/com/github/alexmodguy/alexscaves/server/entity/item/CandyCaneHookEntity.java +++ b/src/main/java/com/github/alexmodguy/alexscaves/server/entity/item/CandyCaneHookEntity.java @@ -151,7 +151,7 @@ public void tick() { this.entityData.set(OWNER_ID, owner == null ? -1 : owner.getId()); this.entityData.set(HOOKED_ENTITY_ID, hooked == null ? -1 : hooked.getId()); boolean reelingFromHook = isOwnerHoldingHook(false); - if (!isReeling() && reelingFromHook || playerOwner.isShiftKeyDown()) { + if (!isReeling() && reelingFromHook || playerOwner != null && playerOwner.isShiftKeyDown()) { this.setReeling(true); } if(isReeling() && !reelingFromHook){