fix AlexModGuy#1253 fix AlexModGuy#1242

unroman · Oct 20, 2024 · 59fb47a · 59fb47a
1 parent d372957
commit 59fb47a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.../github/alexmodguy/alexscaves/server/block/blockentity/ConversionCrucibleBlockEntity.java b/.../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
@@ -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){