a (#971)

ValkyrienSkies · Sep 28, 2024 · a81efdf · a81efdf
1 parent ca9fc89
commit a81efdf
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/common/src/main/kotlin/org/valkyrienskies/mod/compat/Weather2Compat.kt b/common/src/main/kotlin/org/valkyrienskies/mod/compat/Weather2Compat.kt
@@ -56,20 +56,18 @@ object Weather2Compat {
             applyForcePlusMotion()
 
             mgr.getStormsAround(pos, stormRange).forEach {
-                if (it is StormObject) {
-                    runCatching { // prevent Cannot read field "listLayers" because "this.tornadoFunnelSimple" is null    at weather2.weathersystem.storm.StormObject.spinObject(StormObject.java:2503)
-                        forcePlusMotion = it.spinObject(
-                            pos,
-                            forcePlusMotion,
-                            false,
-                            stormDampen,
-                            stormDampen,
-                            false,
-                            0.0f,
-                        )
+                if (it is StormObject && it.tornadoFunnelSimple != null) {
+                    forcePlusMotion = it.spinObject(
+                        pos,
+                        forcePlusMotion,
+                        false,
+                        stormDampen,
+                        stormDampen,
+                        true,
+                        0.0f,
+                    )
 
-                        applyForcePlusMotion()
-                    }
+                    applyForcePlusMotion()
                 }
             }
         }