Restructure Entity.updateWaterState overwrite to allow mod mixins to …

…work (#30)
Reforged-Hub · Apr 2, 2024 · 50c5c33 · 50c5c33
1 parent 70e75d6
commit 50c5c33
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/src/main/java/me/jellysquid/mods/lithium/mixin/entity/collisions/fluid/EntityMixin.java b/src/main/java/me/jellysquid/mods/lithium/mixin/entity/collisions/fluid/EntityMixin.java
@@ -127,15 +127,7 @@ protected boolean updateWaterState() {
         this.radium$isInModdedFluid = false;
         this.checkWaterState();
 
-        if (this.radium$isInModdedFluid) {
-            this.handleModdedFluidBehaviors();
-        }
-
-        return this.isInFluidType();
-    }
-
-    private void handleModdedFluidBehaviors() {
-        if (!(this.getVehicle() instanceof BoatEntity)) {
+        if (this.radium$isInModdedFluid && !(this.getVehicle() instanceof BoatEntity)) {
             float fallDistanceModifier = Float.MAX_VALUE;
             boolean canExtinguish = false;
 
@@ -154,6 +146,8 @@ private void handleModdedFluidBehaviors() {
                 this.extinguish();
             }
         }
+
+        return this.isInFluidType();
     }
 
     /**