craftbukkit/nms-patches/net/minecraft/server/AdvancementDataPlayer.patch

24 lines
1.7 KiB
Diff
Raw Normal View History

2017-05-14 12:00:00 +10:00
--- a/net/minecraft/server/AdvancementDataPlayer.java
+++ b/net/minecraft/server/AdvancementDataPlayer.java
2021-03-16 09:00:00 +11:00
@@ -181,7 +181,11 @@
2020-06-25 10:00:00 +10:00
Advancement advancement = advancementdataworld.a((MinecraftKey) entry.getKey());
2018-07-15 10:00:00 +10:00
if (advancement == null) {
2021-06-11 15:00:00 +10:00
- AdvancementDataPlayer.LOGGER.warn("Ignored advancement '{}' in progress file {} - it doesn't exist anymore?", entry.getKey(), this.file);
2018-07-15 10:00:00 +10:00
+ // CraftBukkit start
2019-07-20 09:00:00 +10:00
+ if (entry.getKey().getNamespace().equals("minecraft")) {
2021-06-11 15:00:00 +10:00
+ AdvancementDataPlayer.LOGGER.warn("Ignored advancement '{}' in progress file {} - it doesn't exist anymore?", entry.getKey(), this.file);
2018-07-15 10:00:00 +10:00
+ }
+ // CraftBukkit end
} else {
this.a(advancement, (AdvancementProgress) entry.getValue());
}
2021-06-11 15:00:00 +10:00
@@ -276,6 +280,7 @@
this.progressChanged.add(advancement);
2017-05-14 12:00:00 +10:00
flag = true;
if (!flag1 && advancementprogress.isDone()) {
2021-06-11 15:00:00 +10:00
+ this.player.level.getServer().getPluginManager().callEvent(new org.bukkit.event.player.PlayerAdvancementDoneEvent(this.player.getBukkitEntity(), advancement.bukkit)); // CraftBukkit
2017-05-14 12:00:00 +10:00
advancement.d().a(this.player);
2021-06-11 15:00:00 +10:00
if (advancement.c() != null && advancement.c().i() && this.player.level.getGameRules().getBoolean(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)) {
this.playerList.sendMessage(new ChatMessage("chat.type.advancement." + advancement.c().e().a(), new Object[]{this.player.getScoreboardDisplayName(), advancement.j()}), ChatMessageType.SYSTEM, SystemUtils.NIL_UUID);