diff --git a/core b/core
index 43feb2d7f..410fe684e 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 43feb2d7fe73690c1e06560f8f0ea6f6256b827a
+Subproject commit 410fe684ec3981f687198036a75b985e12a3087b
diff --git a/forge/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java b/forge/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java
index de0d79af7..4e2aa4dc3 100644
--- a/forge/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java
+++ b/forge/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java
@@ -50,6 +50,7 @@ public class ForgeClientProxy
 	@SubscribeEvent
 	public void serverTickEvent(TickEvent.ServerTickEvent event)
 	{
+		if (event.phase != TickEvent.Phase.START) return;
 		eventApi.serverTickEvent();
 	}