mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-22 18:45:54 +01:00
89d51d5f29
Because this exploit has been widely known for years and has not been fixed by Mojang, we decided that it was worth allowing people to toggle it on/off due to how easy it is to make it configurable. It should be noted that this decision does not promise all future exploits will be configurable.
40 lines
2.5 KiB
Diff
40 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: LemonCaramel <admin@caramel.moe>
|
|
Date: Sun, 24 Sep 2023 20:19:44 +0900
|
|
Subject: [PATCH] Fix UnsafeValues#loadAdvancement
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
|
index fab7dc81f774889300ed0affaef71cbda36517df..6372f3a4fdf6e37ef785749ec40c3bd67b003b28 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
|
@@ -321,7 +321,27 @@ public final class CraftMagicNumbers implements UnsafeValues {
|
|
JsonElement jsonelement = ServerAdvancementManager.GSON.fromJson(advancement, JsonElement.class);
|
|
net.minecraft.advancements.Advancement nms = Util.getOrThrow(net.minecraft.advancements.Advancement.CODEC.parse(JsonOps.INSTANCE, jsonelement), JsonParseException::new);
|
|
if (nms != null) {
|
|
- MinecraftServer.getServer().getAdvancements().advancements.put(minecraftkey, new AdvancementHolder(minecraftkey, nms));
|
|
+ // Paper start - Fix throw UnsupportedOperationException
|
|
+ //MinecraftServer.getServer().getAdvancements().advancements.put(minecraftkey, new AdvancementHolder(minecraftkey, nms));
|
|
+ final com.google.common.collect.ImmutableMap.Builder<ResourceLocation, AdvancementHolder> mapBuilder = com.google.common.collect.ImmutableMap.builder();
|
|
+ mapBuilder.putAll(MinecraftServer.getServer().getAdvancements().advancements);
|
|
+
|
|
+ final AdvancementHolder holder = new AdvancementHolder(minecraftkey, nms);
|
|
+ mapBuilder.put(minecraftkey, holder);
|
|
+
|
|
+ MinecraftServer.getServer().getAdvancements().advancements = mapBuilder.build();
|
|
+ final net.minecraft.advancements.AdvancementTree tree = MinecraftServer.getServer().getAdvancements().tree();
|
|
+ tree.addAll(List.of(holder));
|
|
+
|
|
+ // recalculate advancement position
|
|
+ final net.minecraft.advancements.AdvancementNode node = tree.get(minecraftkey);
|
|
+ if (node != null) {
|
|
+ final net.minecraft.advancements.AdvancementNode root = node.root();
|
|
+ if (root.holder().value().display().isPresent()) {
|
|
+ net.minecraft.advancements.TreeNodePosition.run(root);
|
|
+ }
|
|
+ }
|
|
+ // Paper end - Fix throw UnsupportedOperationException
|
|
Advancement bukkit = Bukkit.getAdvancement(key);
|
|
|
|
if (bukkit != null) {
|