From 004ab59e6f3d050d1d21f2b53793a1997645c0b5 Mon Sep 17 00:00:00 2001 From: Cyborgmas Date: Wed, 27 Jan 2021 20:22:58 -0500 Subject: [PATCH] Properly encode registries. (#7626) --- src/main/java/net/minecraftforge/common/ForgeHooks.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java index 034a419b4b..56d35e3ac1 100644 --- a/src/main/java/net/minecraftforge/common/ForgeHooks.java +++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java @@ -106,6 +106,7 @@ import net.minecraft.util.registry.DynamicRegistries; import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.SimpleRegistry; import net.minecraft.util.registry.WorldSettingsImport; +import net.minecraft.util.registry.WorldGenSettingsExport; import net.minecraft.util.text.*; import net.minecraft.world.*; import net.minecraft.world.chunk.IChunk; @@ -1337,7 +1338,7 @@ public class ForgeHooks // This assumes that the datapacks for the vanilla dimensions have not changed since they were "deleted" // If they did, this will be seen in newly generated chunks. // Since this is to fix an older world, from before the fixes by forge, there is no way to know the state of the dimension when it was "deleted". - dimReg = CODEC.getValue().encodeStart(ops, dimReg).flatMap(t -> CODEC.getValue().parse(ops, t)).result().orElse(dimReg); + dimReg = CODEC.getValue().encodeStart(WorldGenSettingsExport.create(ops, regs), dimReg).flatMap(t -> CODEC.getValue().parse(ops, t)).result().orElse(dimReg); for (String name : VANILLA_DIMS) { if (currentDimNames.contains(name))