Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-06 15:41:38 +01:00
Code Issues Projects Releases Wiki Activity

Fix UnsafeValues#loadAdvancement

Browse Source
This commit is contained in:
LemonCaramel 2023-09-24 20:19:44 +09:00
parent efc4457fa1
commit de8998e411
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
View File

@ -303,9 +303,30 @@ public final class CraftMagicNumbers implements UnsafeValues {
ResourceLocation minecraftkey = CraftNamespacedKey.toMinecraft(key); ResourceLocation minecraftkey = CraftNamespacedKey.toMinecraft(key);
JsonElement jsonelement = JsonParser.parseString(advancement); JsonElement jsonelement = JsonParser.parseString(advancement);
net.minecraft.advancements.Advancement nms = net.minecraft.advancements.Advancement.CODEC.parse(JsonOps.INSTANCE, jsonelement).getOrThrow(JsonParseException::new); final net.minecraft.resources.RegistryOps<JsonElement> ops = CraftRegistry.getMinecraftRegistry().createSerializationContext(JsonOps.INSTANCE); // Paper - use RegistryOps
final net.minecraft.advancements.Advancement nms = net.minecraft.advancements.Advancement.CODEC.parse(ops, jsonelement).getOrThrow(JsonParseException::new); // Paper - use RegistryOps
if (nms != null) { 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(java.util.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); Advancement bukkit = Bukkit.getAdvancement(key);
if (bukkit != null) { if (bukkit != null) {