advancement stuff

2024-12-13 11:38:42 -05:00
parent ee51737be6
commit a68b56a864
8 changed files with 57 additions and 67 deletions
--- a/paper-server/patches/sources/net/minecraft/advancements/AdvancementHolder.java.patch
+++ b/paper-server/patches/sources/net/minecraft/advancements/AdvancementHolder.java.patch
@@ -0,0 +1,13 @@
+--- a/net/minecraft/advancements/AdvancementHolder.java
+++ b/net/minecraft/advancements/AdvancementHolder.java
+@@ -26,4 +_,10 @@
+     public String toString() {
+         return this.id.toString();
+     }
+
+    // CraftBukkit start
+    public final org.bukkit.advancement.Advancement toBukkit() {
+        return new org.bukkit.craftbukkit.advancement.CraftAdvancement(this);
+    }
+    // CraftBukkit end
+ }
--- a/paper-server/patches/sources/net/minecraft/advancements/AdvancementTree.java.patch
+++ b/paper-server/patches/sources/net/minecraft/advancements/AdvancementTree.java.patch
@@ -0,0 +1,20 @@
+--- a/net/minecraft/advancements/AdvancementTree.java
+++ b/net/minecraft/advancements/AdvancementTree.java
+@@ -26,7 +_,7 @@
+             this.remove(advancementNode);
+         }
+ 
+-        LOGGER.info("Forgot about advancement {}", node.holder());
+        LOGGER.debug("Forgot about advancement {}", node.holder()); // Paper - Improve logging and errors
+         this.nodes.remove(node.holder().id());
+         if (node.parent() == null) {
+             this.roots.remove(node);
+@@ -62,7 +_,7 @@
+             }
+         }
+ 
+-        LOGGER.info("Loaded {} advancements", this.nodes.size());
+        // LOGGER.info("Loaded {} advancements", this.nodes.size()); // CraftBukkit - moved to AdvancementDataWorld#reload // Paper - Improve logging and errors; you say it was moved... but it wasn't :) it should be moved however, since this is called when the API creates an advancement
+     }
+ 
+     private boolean tryInsert(AdvancementHolder advancement) {
--- a/paper-server/patches/sources/net/minecraft/advancements/DisplayInfo.java.patch
+++ b/paper-server/patches/sources/net/minecraft/advancements/DisplayInfo.java.patch
@@ -0,0 +1,10 @@
+--- a/net/minecraft/advancements/DisplayInfo.java
+++ b/net/minecraft/advancements/DisplayInfo.java
+@@ -37,6 +_,7 @@
+     private final boolean hidden;
+     private float x;
+     private float y;
+    public final io.papermc.paper.advancement.AdvancementDisplay paper = new io.papermc.paper.advancement.PaperAdvancementDisplay(this); // Paper - Add more advancement API
+ 
+     public DisplayInfo(
+         ItemStack icon,
--- a/paper-server/patches/sources/net/minecraft/advancements/critereon/LocationPredicate.java.patch
+++ b/paper-server/patches/sources/net/minecraft/advancements/critereon/LocationPredicate.java.patch
@@ -0,0 +1,11 @@
+--- a/net/minecraft/advancements/critereon/LocationPredicate.java
+++ b/net/minecraft/advancements/critereon/LocationPredicate.java
+@@ -44,7 +_,7 @@
+     public boolean matches(ServerLevel level, double x, double y, double z) {
+         if (this.position.isPresent() && !this.position.get().matches(x, y, z)) {
+             return false;
+-        } else if (this.dimension.isPresent() && this.dimension.get() != level.dimension()) {
+        } else if (this.dimension.isPresent() && this.dimension.get() != (io.papermc.paper.configuration.GlobalConfiguration.get().misc.strictAdvancementDimensionCheck ? level.dimension() : org.bukkit.craftbukkit.util.CraftDimensionUtil.getMainDimensionKey(level))) { // Paper - Add option for strict advancement dimension checks
+             return false;
+         } else {
+             BlockPos blockPos = BlockPos.containing(x, y, z);
--- a/paper-server/patches/sources/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java.patch
+++ b/paper-server/patches/sources/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java.patch
@@ -0,0 +1,52 @@
+--- a/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java
+++ b/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java
+@@ -15,41 +_,41 @@
+ import net.minecraft.world.level.storage.loot.LootContext;
+ 
+ public abstract class SimpleCriterionTrigger<T extends SimpleCriterionTrigger.SimpleInstance> implements CriterionTrigger<T> {
+-    private final Map<PlayerAdvancements, Set<CriterionTrigger.Listener<T>>> players = Maps.newIdentityHashMap();
+    // private final Map<PlayerAdvancements, Set<CriterionTrigger.Listener<T>>> players = Maps.newIdentityHashMap(); // Paper - fix AdvancementDataPlayer leak; moved into AdvancementDataPlayer to fix memory leak
+ 
+     @Override
+     public final void addPlayerListener(PlayerAdvancements playerAdvancements, CriterionTrigger.Listener<T> listener) {
+-        this.players.computeIfAbsent(playerAdvancements, advancements -> Sets.newHashSet()).add(listener);
+        playerAdvancements.criterionData.computeIfAbsent(this, managerx -> Sets.newHashSet()).add(listener);  // Paper - fix AdvancementDataPlayer leak
+     }
+ 
+     @Override
+     public final void removePlayerListener(PlayerAdvancements playerAdvancements, CriterionTrigger.Listener<T> listener) {
+-        Set<CriterionTrigger.Listener<T>> set = this.players.get(playerAdvancements);
+        Set<CriterionTrigger.Listener<T>> set = (Set) playerAdvancements.criterionData.get(this); // Paper - fix AdvancementDataPlayer leak
+         if (set != null) {
+             set.remove(listener);
+             if (set.isEmpty()) {
+-                this.players.remove(playerAdvancements);
+                playerAdvancements.criterionData.remove(this); // Paper - fix AdvancementDataPlayer leak
+             }
+         }
+     }
+ 
+     @Override
+     public final void removePlayerListeners(PlayerAdvancements playerAdvancements) {
+-        this.players.remove(playerAdvancements);
+        playerAdvancements.criterionData.remove(this); // Paper - fix AdvancementDataPlayer leak
+     }
+ 
+     protected void trigger(ServerPlayer player, Predicate<T> testTrigger) {
+         PlayerAdvancements advancements = player.getAdvancements();
+-        Set<CriterionTrigger.Listener<T>> set = this.players.get(advancements);
+        Set<CriterionTrigger.Listener<T>> set = (Set) advancements.criterionData.get(this); // Paper - fix AdvancementDataPlayer leak
+         if (set != null && !set.isEmpty()) {
+-            LootContext lootContext = EntityPredicate.createContext(player, player);
+            LootContext lootContext = null; // EntityPredicate.createContext(player, player); // Paper - Perf: lazily create LootContext for criterions
+             List<CriterionTrigger.Listener<T>> list = null;
+ 
+             for (CriterionTrigger.Listener<T> listener : set) {
+                 T simpleInstance = listener.trigger();
+                 if (testTrigger.test(simpleInstance)) {
+                     Optional<ContextAwarePredicate> optional = simpleInstance.player();
+-                    if (optional.isEmpty() || optional.get().matches(lootContext)) {
+                    if (optional.isEmpty() || optional.get().matches(lootContext = (lootContext == null ? EntityPredicate.createContext(player, player) : lootContext))) { // Paper - Perf: lazily create LootContext for criterions
+                         if (list == null) {
+                             list = Lists.newArrayList();
+                         }