Merge remote-tracking branch 'origin/master-1.20-lts' into master-1.21

CyclopsMC · Sep 5, 2024 · 56081f0 · 56081f0
2 parents 9476196 + 2e73e73
commit 56081f0
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/resources/changelog/1.19.2-1.2.39.txt b/resources/changelog/1.19.2-1.2.39.txt
@@ -0,0 +1,6 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.17.0 or higher.
+
+Fixes:
+* Fix crash when copy_tank_data loot function is applied to wrong block, Closes #1056
+
diff --git a/resources/changelog/1.20.1-1.2.46.txt b/resources/changelog/1.20.1-1.2.46.txt
@@ -0,0 +1,6 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.18.4 or higher.
+
+Fixes:
+* Fix crash when copy_tank_data loot function is applied to wrong block, Closes #1056
+
diff --git a/src/main/java/org/cyclops/evilcraft/loot/functions/LootFunctionCopyTankData.java b/src/main/java/org/cyclops/evilcraft/loot/functions/LootFunctionCopyTankData.java
@@ -33,17 +33,18 @@ protected LootFunctionCopyTankData(List<LootItemCondition> conditionsIn) {
 
     @Override
     public ItemStack run(ItemStack itemStack, LootContext lootContext) {
-        BlockEntityTankInventory tile = (BlockEntityTankInventory) lootContext.getParamOrNull(LootContextParams.BLOCK_ENTITY);
-        SingleUseTank fluidHandlerTile = tile.getTank();
-        Optional.ofNullable(itemStack.getCapability(Capabilities.FluidHandler.ITEM))
-                .ifPresent(fluidHandlerItem -> {
-                    if (fluidHandlerItem instanceof IFluidHandlerMutable) {
-                        ((IFluidHandlerMutable) fluidHandlerItem).setFluidInTank(0, fluidHandlerTile.getFluidInTank(0));
-                    }
-                    if (fluidHandlerItem instanceof IFluidHandlerItemCapacity) {
-                        ((IFluidHandlerItemCapacity) fluidHandlerItem).setCapacity(fluidHandlerTile.getTankCapacity(0));
-                    }
-                });
+        if (lootContext.getParamOrNull(LootContextParams.BLOCK_ENTITY) instanceof BlockEntityTankInventory tile) {
+            SingleUseTank fluidHandlerTile = tile.getTank();
+            Optional.ofNullable(itemStack.getCapability(Capabilities.FluidHandler.ITEM))
+                    .ifPresent(fluidHandlerItem -> {
+                        if (fluidHandlerItem instanceof IFluidHandlerMutable) {
+                            ((IFluidHandlerMutable) fluidHandlerItem).setFluidInTank(0, fluidHandlerTile.getFluidInTank(0));
+                        }
+                        if (fluidHandlerItem instanceof IFluidHandlerItemCapacity) {
+                            ((IFluidHandlerItemCapacity) fluidHandlerItem).setCapacity(fluidHandlerTile.getTankCapacity(0));
+                        }
+                    });
+        }
         return itemStack;
     }