Handle play packets on main thread.

modmuss50 · Jan 21, 2024 · ac73fbc · ac73fbc
1 parent 8f1d721
commit ac73fbc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/...v1/src/client/java/net/fabricmc/fabric/impl/networking/client/ClientPlayNetworkAddon.java b/...v1/src/client/java/net/fabricmc/fabric/impl/networking/client/ClientPlayNetworkAddon.java
@@ -72,7 +72,9 @@ public void onServerReady() {
 
 	@Override
 	protected void receive(ClientPlayNetworking.PlayPacketHandler<?> handler, CustomPayload payload) {
-		((ClientPlayNetworking.PlayPacketHandler) handler).receive(payload, this.client.player, this);
+		this.client.execute(() -> {
+			((ClientPlayNetworking.PlayPacketHandler) handler).receive(payload, client.player, ClientPlayNetworkAddon.this);
+		});
 	}
 
 	// impl details

diff --git a/...i-v1/src/main/java/net/fabricmc/fabric/impl/networking/server/ServerPlayNetworkAddon.java b/...i-v1/src/main/java/net/fabricmc/fabric/impl/networking/server/ServerPlayNetworkAddon.java
@@ -62,9 +62,10 @@ public void onClientReady() {
 	}
 
 	@Override
-	protected void receive(ServerPlayNetworking.PlayPayloadHandler<?> handler, CustomPayload payload) {
-		// TODO 1.20.5 fix me
-		((ServerPlayNetworking.PlayPayloadHandler) handler).receive(payload, this.handler.player, this);
+	protected void receive(ServerPlayNetworking.PlayPayloadHandler<?> payloadHandler, CustomPayload payload) {
+		this.server.execute(() -> {
+			((ServerPlayNetworking.PlayPayloadHandler) payloadHandler).receive(payload, ServerPlayNetworkAddon.this.handler.player, ServerPlayNetworkAddon.this);
+		});
 	}
 
 	// impl details