From 3c87044dc59a43d4c785d0104bbd4fc1d945ee18 Mon Sep 17 00:00:00 2001 From: PepperCode1 <44146161+PepperCode1@users.noreply.github.com> Date: Wed, 30 Mar 2022 17:44:16 -0700 Subject: [PATCH] Super empty fluid - Fix NPE with hose pulley - Update Forge and Registrate --- gradle.properties | 4 ++-- .../fluids/actors/FluidManipulationBehaviour.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 504689cf8..bef758929 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.daemon = false # mod version info mod_version = 0.4.1 minecraft_version = 1.18.2 -forge_version = 40.0.19 +forge_version = 40.0.34 # build dependency versions forgegradle_version = 5.1.+ @@ -18,7 +18,7 @@ cursegradle_version = 1.4.0 parchment_version = 2022.03.13 # dependency versions -registrate_version = MC1.18.2-1.0.24 +registrate_version = MC1.18.2-1.0.25 flywheel_version = 1.18-0.6.2.64 jei_minecraft_version = 1.18.2 jei_version = 9.5.3.143 diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidManipulationBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidManipulationBehaviour.java index ba3267b22..f859a286c 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidManipulationBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidManipulationBehaviour.java @@ -213,6 +213,8 @@ public abstract class FluidManipulationBehaviour extends TileEntityBehaviour { } protected boolean canDrainInfinitely(Fluid fluid) { + if (fluid == null) + return false; return maxBlocks() != -1 && AllConfigs.SERVER.fluids.bottomlessFluidMode.get().test(fluid); }