From cbe23a6aba9cf35013d457b5bec01c64dfc7b57f Mon Sep 17 00:00:00 2001
From: simibubi <31564874+simibubi@users.noreply.github.com>
Date: Fri, 27 Nov 2020 20:37:10 +0100
Subject: [PATCH] Fix coupling data not being sent to clients

---
 .../train/capability/CapabilityMinecartController.java | 10 ++++++++++
 .../java/com/simibubi/create/events/CommonEvents.java  |  7 +++++++
 2 files changed, 17 insertions(+)

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 19bd2ef7f..cf3b5abe2 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
@@ -36,6 +36,7 @@ import net.minecraftforge.common.capabilities.ICapabilitySerializable;
 import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.common.util.NonNullConsumer;
 import net.minecraftforge.event.AttachCapabilitiesEvent;
+import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.event.world.ChunkEvent;
 
 public class CapabilityMinecartController implements ICapabilitySerializable<CompoundNBT> {
@@ -200,6 +201,7 @@ public class CapabilityMinecartController implements ICapabilitySerializable<Com
 		Entity entity = event.getObject();
 		if (!(entity instanceof AbstractMinecartEntity))
 			return;
+
 		CapabilityMinecartController capability = new CapabilityMinecartController((AbstractMinecartEntity) entity);
 		ResourceLocation id = Create.asResource("minecart_controller");
 		event.addCapability(id, capability);
@@ -211,6 +213,14 @@ public class CapabilityMinecartController implements ICapabilitySerializable<Com
 			.add((AbstractMinecartEntity) entity);
 	}
 
+	public static void startTracking(PlayerEvent.StartTracking event) {
+		Entity entity = event.getTarget();
+		if (!(entity instanceof AbstractMinecartEntity))
+			return;
+		entity.getCapability(MINECART_CONTROLLER_CAPABILITY)
+			.ifPresent(MinecartController::sendData);
+	}
+
 	public static void register() {
 		CapabilityManager.INSTANCE.register(MinecartController.class, new Capability.IStorage<MinecartController>() {
 
diff --git a/src/main/java/com/simibubi/create/events/CommonEvents.java b/src/main/java/com/simibubi/create/events/CommonEvents.java
index eef7bbb7f..3120fb8d1 100644
--- a/src/main/java/com/simibubi/create/events/CommonEvents.java
+++ b/src/main/java/com/simibubi/create/events/CommonEvents.java
@@ -9,6 +9,7 @@ import com.simibubi.create.content.contraptions.fluids.recipe.PotionMixingRecipe
 import com.simibubi.create.content.contraptions.wrench.WrenchItem;
 import com.simibubi.create.content.schematics.ServerSchematicLoader;
 import com.simibubi.create.foundation.command.AllCommands;
+import com.simibubi.create.foundation.utility.Debug;
 import com.simibubi.create.foundation.utility.ServerSpeedProvider;
 import com.simibubi.create.foundation.utility.WorldAttached;
 import com.simibubi.create.foundation.utility.recipe.RecipeFinder;
@@ -25,6 +26,7 @@ import net.minecraftforge.event.TickEvent.WorldTickEvent;
 import net.minecraftforge.event.entity.EntityJoinWorldEvent;
 import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
 import net.minecraftforge.event.entity.player.AttackEntityEvent;
+import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.event.world.ChunkEvent;
 import net.minecraftforge.event.world.WorldEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -121,5 +123,10 @@ public class CommonEvents {
 	public static void attachCapabilities(AttachCapabilitiesEvent<Entity> event) {
 		CapabilityMinecartController.attach(event);
 	}
+	
+	@SubscribeEvent
+	public static void startTracking(PlayerEvent.StartTracking event) {
+		CapabilityMinecartController.startTracking(event);
+	}
 
 }