Fixed crash when moving train from ship to world

ValkyrienSkies · Oct 19, 2023 · 1b862df · 1b862df
1 parent c82b836
commit 1b862df
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...java/org/valkyrienskies/mod/forge/mixin/compat/create/MixinAbstractContraptionEntity.java b/...java/org/valkyrienskies/mod/forge/mixin/compat/create/MixinAbstractContraptionEntity.java
@@ -43,7 +43,10 @@ private void postTick(final CallbackInfo ci) {
         if (wingGroupId != -1 && level instanceof final ServerLevel serverLevel) {
             final LoadedServerShip ship = VSGameUtilsKt.getShipObjectManagingPos(serverLevel,
                 VectorConversionsMCKt.toJOML(thisAsAbstractContraptionEntity.position()));
-            ship.getAttachment(WingManager.class).setWingGroupTransform(wingGroupId, computeContraptionWingTransform());
+            if (ship != null) {
+                // This can happen if a player moves a train contraption from ship to world using a wrench
+                ship.getAttachment(WingManager.class).setWingGroupTransform(wingGroupId, computeContraptionWingTransform());
+            }
         }
     }