From 511950b76625c76e7d0be1a7d55f9ac27348c275 Mon Sep 17 00:00:00 2001
From: simibubi <31564874+simibubi@users.noreply.github.com>
Date: Wed, 13 Jan 2021 18:28:29 +0100
Subject: [PATCH] Hotfix the fix

- More safety for the minecart controller capability
- Blaze burners now support comparators
---
 .../train/capability/CapabilityMinecartController.java | 10 +++++++---
 .../processing/burner/BlazeBurnerBlock.java            | 10 ++++++++++
 .../processing/burner/LitBlazeBurnerBlock.java         | 10 ++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/capability/CapabilityMinecartController.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/capability/CapabilityMinecartController.java
index d26c72d35..71a4b390f 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/capability/CapabilityMinecartController.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/capability/CapabilityMinecartController.java
@@ -102,9 +102,11 @@ public class CapabilityMinecartController implements ICapabilitySerializable<Com
 			
 			if (world.isRemote && carts.containsKey(uniqueID)) {
 				MinecartController minecartController = carts.get(uniqueID);
-				AbstractMinecartEntity minecartEntity = minecartController.cart();
-				if (minecartEntity != null && minecartEntity.getEntityId() != cart.getEntityId()) 
-					continue; // Away with you, Fake Entities!
+				if (minecartController != null) {
+					AbstractMinecartEntity minecartEntity = minecartController.cart();
+					if (minecartEntity != null && minecartEntity.getEntityId() != cart.getEntityId()) 
+						continue; // Away with you, Fake Entities!
+				}
 			}
 			
 			cartsWithCoupling.remove(uniqueID);
@@ -145,6 +147,8 @@ public class CapabilityMinecartController implements ICapabilitySerializable<Com
 			.getPos();
 		Map<UUID, MinecartController> carts = loadedMinecartsByUUID.get(event.getWorld());
 		for (MinecartController minecartController : carts.values()) {
+			if (minecartController == null)
+				continue;
 			if (!minecartController.isPresent())
 				continue;
 			AbstractMinecartEntity cart = minecartController.cart();
diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlock.java b/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlock.java
index 4f91a76bb..c19b07dd3 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlock.java
@@ -216,6 +216,16 @@ public class BlazeBurnerBlock extends Block implements ITE<BlazeBurnerTileEntity
 		builder.addLootPool(poolBuilder.rolls(ConstantRange.of(1)));
 		return builder;
 	}
+	
+	@Override
+	public boolean hasComparatorInputOverride(BlockState p_149740_1_) {
+		return true;
+	}
+	
+	@Override
+	public int getComparatorInputOverride(BlockState state, World p_180641_2_, BlockPos p_180641_3_) {
+		return Math.max(0, state.get(HEAT_LEVEL).ordinal() -1);
+	}
 
 	@OnlyIn(Dist.CLIENT)
 	public void animateTick(BlockState state, World world, BlockPos pos, Random random) {
diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/LitBlazeBurnerBlock.java b/src/main/java/com/simibubi/create/content/contraptions/processing/burner/LitBlazeBurnerBlock.java
index 9966f3c8b..ee1e315ef 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/LitBlazeBurnerBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/processing/burner/LitBlazeBurnerBlock.java
@@ -97,6 +97,16 @@ public class LitBlazeBurnerBlock extends Block {
 			}
 		}
 	}
+	
+	@Override
+	public boolean hasComparatorInputOverride(BlockState p_149740_1_) {
+		return true;
+	}
+	
+	@Override
+	public int getComparatorInputOverride(BlockState state, World p_180641_2_, BlockPos p_180641_3_) {
+		return 1;
+	}
 
 	@Override
 	public VoxelShape getCollisionShape(BlockState state, IBlockReader reader, BlockPos pos,