From 9496b969b58b057b30ae0d21949e595d296419ac Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 1 May 2023 13:54:55 +0100 Subject: [PATCH] Fix a regresstion preveting clients with an un-modded regsitry joining servers with modded registries. (#3036) --- .../fabric/impl/registry/sync/RegistrySyncManager.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/RegistrySyncManager.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/RegistrySyncManager.java index b86e5783f..3afd3c674 100644 --- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/RegistrySyncManager.java +++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/RegistrySyncManager.java @@ -347,6 +347,13 @@ public final class RegistrySyncManager { continue; } + final RegistryAttributeHolder attributeHolder = RegistryAttributeHolder.get(registry.getKey()); + + if (!attributeHolder.hasAttribute(RegistryAttribute.MODDED)) { + // Registry is not modded on the client, dont check. A print to debug is logged in apply. + continue; + } + for (Identifier remoteId : remoteRegistry.keySet()) { if (!registry.containsId(remoteId)) { // Found a registry entry from the server that is