Initial 26.2 port

This commit is contained in:
granny
2026-06-03 16:22:25 -07:00
parent bb69e15257
commit 1638c22046
144 changed files with 1133 additions and 830 deletions

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/PlayerAdvancements.java
+++ b/net/minecraft/server/PlayerAdvancements.java
@@ -148,6 +_,7 @@
@@ -146,6 +_,7 @@
AdvancementHolder advancement = manager.get(id);
if (advancement == null) {
if (!id.getNamespace().equals(Identifier.DEFAULT_NAMESPACE)) return; // CraftBukkit
@@ -8,7 +8,7 @@
LOGGER.warn("Ignored advancement '{}' in progress file {} - it doesn't exist anymore?", id, this.playerSavePath);
} else {
this.startProgress(advancement, progress);
@@ -195,6 +_,7 @@
@@ -193,6 +_,7 @@
holder.value().display().ifPresent(display -> {
// Paper start - Add Adventure message to PlayerAdvancementDoneEvent
if (event.message() != null && this.player.level().getGameRules().get(GameRules.SHOW_ADVANCEMENT_MESSAGES)) {