fix: crash caused by missing null check

Layers-of-Railways · Nov 20, 2024 · ae9324d · ae9324d
1 parent 57abcfe
commit ae9324d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/main/java/dev/ithundxr/railwaystweaks/mixin/compat/create/BlockHelperMixin.java b/src/main/java/dev/ithundxr/railwaystweaks/mixin/compat/create/BlockHelperMixin.java
@@ -0,0 +1,16 @@
+package dev.ithundxr.railwaystweaks.mixin.compat.create;
+
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.llamalad7.mixinextras.sugar.Local;
+import com.simibubi.create.foundation.utility.BlockHelper;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(BlockHelper.class)
+public class BlockHelperMixin {
+    @ModifyExpressionValue(method = "placeSchematicBlock", at = @At(value = "INVOKE", target = "Ljava/lang/Object;equals(Ljava/lang/Object;)Z"))
+    private static boolean railwayTweaks$fixSchematicannonCrash(boolean original, @Local(ordinal = 1) BlockEntity loaded) {
+        return loaded != null && original;
+    }
+}
diff --git a/src/main/resources/railwaystweaks.mixins.json b/src/main/resources/railwaystweaks.mixins.json
@@ -11,6 +11,7 @@
     "ServerPlayerMixin",
     "ServerStatusPacketListenerImplMixin",
     "compat.appleskin.SyncHandlerMixin",
+    "compat.create.BlockHelperMixin",
     "compat.create.Carriage$DimensionalCarriageEntityMixin",
     "compat.create.CarriageAccessor",
     "compat.create.SchematicannonBlockEntityMixin",