From 1fe647b16ef9203c40ba0a62920de693c2918a47 Mon Sep 17 00:00:00 2001
From: simibubi <31564874+simibubi@users.noreply.github.com>
Date: Sat, 9 May 2020 19:17:51 +0200
Subject: [PATCH] Place & Crash

- Fixed some incompatibilities between kinetic blocks and schematic tools
---
 .../contraptions/bearing/MechanicalBearingBlock.java   | 10 +++++++---
 .../bearing/MechanicalBearingTileEntity.java           |  3 +++
 .../contraptions/components/fan/EncasedFanBlock.java   |  3 +++
 .../components/flywheel/engine/FurnaceEngineBlock.java |  3 +++
 .../schematics/block/SchematicannonTileEntity.java     |  5 +++--
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/MechanicalBearingBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/MechanicalBearingBlock.java
index 7fe9b061c..915f45e11 100644
--- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/MechanicalBearingBlock.java
+++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/MechanicalBearingBlock.java
@@ -1,6 +1,7 @@
 package com.simibubi.create.modules.contraptions.components.contraptions.bearing;
 
 import com.simibubi.create.foundation.block.ITE;
+import com.simibubi.create.foundation.utility.WrappedWorld;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
@@ -18,7 +19,7 @@ public class MechanicalBearingBlock extends BearingBlock implements ITE<Mechanic
 	public TileEntity createTileEntity(BlockState state, IBlockReader world) {
 		return new MechanicalBearingTileEntity();
 	}
-	
+
 	@Override
 	public boolean onBlockActivated(BlockState state, World worldIn, BlockPos pos, PlayerEntity player, Hand handIn,
 			BlockRayTraceResult hit) {
@@ -40,18 +41,21 @@ public class MechanicalBearingBlock extends BearingBlock implements ITE<Mechanic
 		}
 		return false;
 	}
-	
+
 	@Override
 	public void onBlockAdded(BlockState state, World worldIn, BlockPos pos, BlockState oldState, boolean isMoving) {
+		if (worldIn instanceof WrappedWorld)
+			return;
 		withTileEntityDo(worldIn, pos, MechanicalBearingTileEntity::neighbourChanged);
 	}
 
 	@Override
 	public void neighborChanged(BlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos,
 			boolean isMoving) {
+		if (worldIn instanceof WrappedWorld)
+			return;
 		if (worldIn.isRemote)
 			return;
-
 		withTileEntityDo(worldIn, pos, MechanicalBearingTileEntity::neighbourChanged);
 	}
 
diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/MechanicalBearingTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/MechanicalBearingTileEntity.java
index bffbbc4e5..53e79e884 100644
--- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/MechanicalBearingTileEntity.java
+++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/MechanicalBearingTileEntity.java
@@ -62,6 +62,9 @@ public class MechanicalBearingTileEntity extends GeneratingKineticTileEntity imp
 	}
 
 	public void neighbourChanged() {
+		if (!hasWorld())
+			return;
+		
 		boolean shouldWindmill = world.isBlockPowered(pos);
 		if (shouldWindmill == isWindmill)
 			return;
diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/fan/EncasedFanBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/fan/EncasedFanBlock.java
index 0ae14d53c..c961d42e4 100644
--- a/src/main/java/com/simibubi/create/modules/contraptions/components/fan/EncasedFanBlock.java
+++ b/src/main/java/com/simibubi/create/modules/contraptions/components/fan/EncasedFanBlock.java
@@ -1,6 +1,7 @@
 package com.simibubi.create.modules.contraptions.components.fan;
 
 import com.simibubi.create.foundation.block.ITE;
+import com.simibubi.create.foundation.utility.WrappedWorld;
 import com.simibubi.create.modules.contraptions.base.DirectionalKineticBlock;
 
 import net.minecraft.block.Block;
@@ -50,6 +51,8 @@ public class EncasedFanBlock extends DirectionalKineticBlock implements ITE<Enca
 	}
 
 	protected void blockUpdate(BlockState state, World worldIn, BlockPos pos) {
+		if (worldIn instanceof WrappedWorld)
+			return;
 		notifyFanTile(worldIn, pos);
 		if (worldIn.isRemote)
 			return;
diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/FurnaceEngineBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/FurnaceEngineBlock.java
index f05ca701a..bc5afe937 100644
--- a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/FurnaceEngineBlock.java
+++ b/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/FurnaceEngineBlock.java
@@ -4,6 +4,7 @@ import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.foundation.block.ITE;
 import com.simibubi.create.foundation.utility.AllShapes;
+import com.simibubi.create.foundation.utility.WrappedWorld;
 
 import net.minecraft.block.AbstractFurnaceBlock;
 import net.minecraft.block.Block;
@@ -53,6 +54,8 @@ public class FurnaceEngineBlock extends EngineBlock implements ITE<FurnaceEngine
 	public void neighborChanged(BlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos,
 			boolean isMoving) {
 		super.neighborChanged(state, worldIn, pos, blockIn, fromPos, isMoving);
+		if (worldIn instanceof WrappedWorld)
+			return;
 		if (worldIn.isRemote)
 			return;
 
diff --git a/src/main/java/com/simibubi/create/modules/schematics/block/SchematicannonTileEntity.java b/src/main/java/com/simibubi/create/modules/schematics/block/SchematicannonTileEntity.java
index e67d8b78f..bf5c76879 100644
--- a/src/main/java/com/simibubi/create/modules/schematics/block/SchematicannonTileEntity.java
+++ b/src/main/java/com/simibubi/create/modules/schematics/block/SchematicannonTileEntity.java
@@ -170,7 +170,7 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC
 	public void read(CompoundNBT compound) {
 		inventory.deserializeNBT(compound.getCompound("Inventory"));
 
-		if (compound.contains("Running"))
+		if (compound.contains("CurrentPos"))
 			currentPos = NBTUtil.readBlockPos(compound.getCompound("CurrentPos"));
 
 		readClientUpdate(compound);
@@ -249,7 +249,8 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC
 
 		if (state == State.RUNNING) {
 			compound.putBoolean("Running", true);
-			compound.put("CurrentPos", NBTUtil.writeBlockPos(currentPos));
+			if (currentPos != null)
+				compound.put("CurrentPos", NBTUtil.writeBlockPos(currentPos));
 		}
 
 		writeToClient(compound);