From 21f792c9f828c6424ab9ec9811902519d7e111ab Mon Sep 17 00:00:00 2001 From: BasiqueEvangelist Date: Thu, 7 Oct 2021 14:21:27 +0300 Subject: [PATCH] Fix handling of orphaned registry entries (#1759) * Fix handling of orphaned registry entries * Fix handling of orphaned registry entries in RegistrySyncManager --- .../impl/registry/sync/PersistentDynamicRegistryHandler.java | 2 +- .../fabricmc/fabric/impl/registry/sync/RegistrySyncManager.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/PersistentDynamicRegistryHandler.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/PersistentDynamicRegistryHandler.java index 509b5b293..a3ffbb478 100644 --- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/PersistentDynamicRegistryHandler.java +++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/PersistentDynamicRegistryHandler.java @@ -169,7 +169,7 @@ public class PersistentDynamicRegistryHandler { for (String key : existingTag.getKeys()) { if (!registryTag.contains(key)) { LOGGER.debug("Saving orphaned registry entry: " + key); - registryTag.putInt(key, registryTag.getInt(key)); + registryTag.putInt(key, existingTag.getInt(key)); } } } 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 edfa351a3..d694b657e 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 @@ -224,7 +224,7 @@ public final class RegistrySyncManager { for (String key : previousRegistryData.getKeys()) { if (!registryTag.contains(key)) { LOGGER.debug("Saving orphaned registry entry: " + key); - registryTag.putInt(key, registryTag.getInt(key)); + registryTag.putInt(key, previousRegistryData.getInt(key)); } } }