From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 13 Jul 2020 06:22:54 -0700 Subject: [PATCH] Fix AdvancementDataPlayer leak due from quitting early in login Move the criterion storage to the AdvancementDataPlayer object itself, so the criterion object stores no references - and thus needs no cleanup. diff --git a/src/main/java/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java b/src/main/java/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java index 06fc39b19385d36fd0c5bb9a7042a238eb6e8a57..bb1f0e9dbcb792d015d1cb65664a96fdd3e0489e 100644 --- a/src/main/java/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java +++ b/src/main/java/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java @@ -14,22 +14,24 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.level.storage.loot.LootContext; public abstract class SimpleCriterionTrigger implements CriterionTrigger { - private final Map>> players = Maps.newIdentityHashMap(); + //private final Map>> players = Maps.newIdentityHashMap(); // Paper - moved into AdvancementDataPlayer to fix memory leak + + public SimpleCriterionTrigger() {} @Override public final void addPlayerListener(PlayerAdvancements manager, CriterionTrigger.Listener conditions) { - this.players.computeIfAbsent(manager, (managerx) -> { + manager.criterionData.computeIfAbsent(this, (managerx) -> { // Paper - fix AdvancementDataPlayer leak return Sets.newHashSet(); }).add(conditions); } @Override public final void removePlayerListener(PlayerAdvancements manager, CriterionTrigger.Listener conditions) { - Set> set = this.players.get(manager); + Set> set = (Set) manager.criterionData.get(this); // Paper - fix AdvancementDataPlayer leak if (set != null) { set.remove(conditions); if (set.isEmpty()) { - this.players.remove(manager); + manager.criterionData.remove(this); // Paper - fix AdvancementDataPlayer leak } } @@ -37,7 +39,7 @@ public abstract class SimpleCriterionTrigger predicate) { PlayerAdvancements playerAdvancements = player.getAdvancements(); - Set> set = this.players.get(playerAdvancements); + Set> set = (Set) playerAdvancements.criterionData.get(this); // Paper - fix AdvancementDataPlayer leak if (set != null && !set.isEmpty()) { LootContext lootContext = EntityPredicate.createContext(player, player); List> list = null; diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java index f8f0be77126d2f3a1c53f7405ce4de4f0dca42be..8096f01fa7f1ed73e4812912fc9b21bafdd212c8 100644 --- a/src/main/java/net/minecraft/server/PlayerAdvancements.java +++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java @@ -40,6 +40,7 @@ import net.minecraft.advancements.Criterion; import net.minecraft.advancements.CriterionProgress; import net.minecraft.advancements.CriterionTrigger; import net.minecraft.advancements.CriterionTriggerInstance; +import net.minecraft.advancements.critereon.SimpleCriterionTrigger; import net.minecraft.network.chat.ChatType; import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.network.protocol.game.ClientboundSelectAdvancementsTabPacket; @@ -70,6 +71,8 @@ public class PlayerAdvancements { private Advancement lastSelectedTab; private boolean isFirstPacket = true; + public final Map> criterionData = Maps.newIdentityHashMap(); // Paper - fix advancement data player leakage + public PlayerAdvancements(DataFixer dataFixer, PlayerList playerManager, ServerAdvancementManager advancementLoader, File advancementFile, ServerPlayer owner) { this.dataFixer = dataFixer; this.playerList = playerManager;