Skip to content

Run DataFix WorldGenSettingsFix as LEVEL instead of WORLD_GEN_SETTINGS #14190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bergerkiller wants to merge 1 commit into
base: main
Choose a base branch
from
+32 −0
Open

Run DataFix WorldGenSettingsFix as LEVEL instead of WORLD_GEN_SETTINGS #14190

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions paper-server/patches/sources/net/minecraft/util/datafix/fixes/WorldGenSettingsFix.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
--- a/net/minecraft/util/datafix/fixes/WorldGenSettingsFix.java
+++ b/net/minecraft/util/datafix/fixes/WorldGenSettingsFix.java
@@ -46,15 +_,26 @@
.build();

public WorldGenSettingsFix(final Schema parent) {
- super(parent, true);
+ super(parent, false); // Paper - operate on LEVEL instead of WORLD_GEN_SETTINGS; see makeRule
}

@Override
protected TypeRewriteRule makeRule() {
return this.fixTypeEverywhereTyped(
"WorldGenSettings building",
- this.getInputSchema().getType(References.WORLD_GEN_SETTINGS),
- settings -> settings.update(DSL.remainderFinder(), WorldGenSettingsFix::fix)
+ // Paper start - run this as part of the LEVEL walk instead of the standalone WORLD_GEN_SETTINGS type;
+ // WORLD_GEN_SETTINGS is never reached while walking LEVEL (it is only wired in via
+ // SAVED_DATA_WORLD_GEN_SETTINGS), so this fix must complete here for LevelDatToSavedDataPreparationFix's
+ // later generate_features -> generate_structures rename (v4771) to see the correct field name
+ this.getInputSchema().getType(References.LEVEL),
+ level -> level.update(DSL.remainderFinder(), dataTag -> {
+ Dynamic<?> worldGenSettings = dataTag.get("WorldGenSettings").orElseEmptyMap();
+
+ worldGenSettings = fix(worldGenSettings);
+
+ return dataTag.set("WorldGenSettings", worldGenSettings);
+ })
+ // Paper end
);
}

Loading