Skip to content

Add earlier trigger for world migration delay in vanilla logic#13792

Merged
kennytv merged 2 commits intomainfrom
fix/earlier-migration-delay
Apr 15, 2026
Merged

Add earlier trigger for world migration delay in vanilla logic#13792
kennytv merged 2 commits intomainfrom
fix/earlier-migration-delay

Conversation

@jpenilla
Copy link
Copy Markdown
Member

No description provided.

@jpenilla jpenilla requested a review from a team as a code owner April 15, 2026 04:48
@github-project-automation github-project-automation Bot moved this to Awaiting review in Paper PR Queue Apr 15, 2026
@jpenilla jpenilla requested review from Copilot and removed request for a team April 15, 2026 04:48
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Adjusts Paper’s startup migration delay so it can be triggered earlier during vanilla/NMS world file fixing, aiming to ensure operators see the backup warning before any upgrade work begins.

Changes:

  • Generalizes an attachment error message in PaperLevelOverrides.
  • Exposes WorldFolderMigration.warnAndDelayStartupMigration() and adds a cross-package flag (didInitialLoad) to gate the warning.
  • Hooks the delay into vanilla FileFixerUpper and marks initial load completion from Main.

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 4 comments.

File Description
paper-server/src/main/java/io/papermc/paper/world/saveddata/PaperLevelOverrides.java Updates exception message when overrides aren’t attached.
paper-server/src/main/java/io/papermc/paper/world/migration/WorldFolderMigration.java Adds startup gating flag and makes the startup delay/warning callable from NMS.
paper-server/patches/sources/net/minecraft/util/filefix/FileFixerUpper.java.patch Triggers Paper’s startup warning/delay before vanilla file fixing begins.
paper-server/patches/sources/net/minecraft/server/Main.java.patch Sets the initial-load completion flag after the main level data fix path.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread paper-server/patches/sources/net/minecraft/server/Main.java.patch Outdated
@kennytv kennytv merged commit 6f4b004 into main Apr 15, 2026
6 checks passed
@kennytv kennytv deleted the fix/earlier-migration-delay branch April 15, 2026 18:37
@github-project-automation github-project-automation Bot moved this from Awaiting review to Merged in Paper PR Queue Apr 15, 2026
@M5er0

This comment was marked as off-topic.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Merged

Development

Successfully merging this pull request may close these issues.

4 participants