spigot/CraftBukkit-Patches/0073-Plug-WorldMap-Memory-Leak.patch

44 lines
2.2 KiB
Diff
Raw Normal View History

2022-08-06 07:40:00 +10:00
From 83f4cddbaf37477dcf9c7dff558f1c43b073a526 Mon Sep 17 00:00:00 2001
2021-06-11 15:00:00 +10:00
From: md_5 <git@md-5.net>
Date: Fri, 8 Aug 2014 19:57:03 +1000
Subject: [PATCH] Plug WorldMap Memory Leak
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
2022-07-28 04:00:00 +10:00
index dcb145102..9499cdc66 100644
2021-06-11 15:00:00 +10:00
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
2022-07-28 04:00:00 +10:00
@@ -2008,6 +2008,29 @@ public class WorldServer extends World implements GeneratorAccessSeed {
2021-06-11 15:00:00 +10:00
2021-11-22 09:00:00 +11:00
public void onTrackingEnd(Entity entity) {
2021-06-11 15:00:00 +10:00
org.spigotmc.AsyncCatcher.catchOp("entity unregister"); // Spigot
+ // Spigot start
+ if ( entity instanceof EntityHuman )
+ {
2021-11-22 09:00:00 +11:00
+ getServer().levels.values().stream().map( WorldServer::getDataStorage ).forEach( (worldData) ->
2021-06-11 15:00:00 +10:00
+ {
+ for (Object o : worldData.cache.values() )
+ {
+ if ( o instanceof WorldMap )
+ {
+ WorldMap map = (WorldMap) o;
+ map.carriedByPlayers.remove( (EntityHuman) entity );
+ for ( Iterator<WorldMap.WorldMapHumanTracker> iter = (Iterator<WorldMap.WorldMapHumanTracker>) map.carriedBy.iterator(); iter.hasNext(); )
+ {
+ if ( iter.next().player == entity )
+ {
+ iter.remove();
+ }
+ }
+ }
+ }
+ } );
+ }
+ // Spigot end
// Spigot Start
if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof EntityPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
2021-06-11 15:00:00 +10:00
for (org.bukkit.entity.HumanEntity h : Lists.newArrayList(((org.bukkit.inventory.InventoryHolder) entity.getBukkitEntity()).getInventory().getViewers())) {
--
2.34.1
2021-06-11 15:00:00 +10:00