Merged changes from 1.18.x

ValkyrienSkies · Dec 28, 2023 · a04911c · a04911c
2 parents cc6e5f8 + 72fac32
commit a04911c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/...org/valkyrienskies/mod/mixin/mod_compat/create/entity/MixinAbstractContraptionEntity.java b/...org/valkyrienskies/mod/mixin/mod_compat/create/entity/MixinAbstractContraptionEntity.java
@@ -290,8 +290,14 @@ private void postTick(final CallbackInfo ci) {
             final LoadedServerShip ship = VSGameUtilsKt.getShipObjectManagingPos(serverLevel,
                 VectorConversionsMCKt.toJOML(thisAsAbstractContraptionEntity.position()));
             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());
+                try {
+                    // This can happen if a player moves a train contraption from ship to world using a wrench
+                    ship.getAttachment(WingManager.class)
+                        .setWingGroupTransform(wingGroupId, computeContraptionWingTransform());
+                } catch (final Exception e) {
+                    // I'm not sure why, but this fails sometimes. For now just catch the error and print it
+                    e.printStackTrace();
+                }
             }
         }
     }

diff --git a/gradle.properties b/gradle.properties
@@ -26,7 +26,7 @@ flywheel_version_fabric=0.6.9-6
 # https://modrinth.com/mod/create-big-cannons/version/
 createbigcannons_version= 0.5.2.a
 
-vs_core_version=1.1.0+c37d346883
+vs_core_version=1.1.0+b19b27c4a4
 # Prevent kotlin from autoincluding stdlib as a dependency, which breaks
 # gradle's composite builds (includeBuild) for some reason. We'll add it manually
 kotlin.stdlib.default.dependency=false