From 775169422d0fe9bb06967e033af6edc7c76f79bb Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 31 Mar 2016 21:43:21 -0400 Subject: [PATCH] Update upstream for memory leak patch --- CraftBukkit | 2 +- .../Fix-Massive-Memory-Leak.patch | 26 ------------------- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 Spigot-Server-Patches/Fix-Massive-Memory-Leak.patch diff --git a/CraftBukkit b/CraftBukkit index 6247aa00cc..f92e01ba5c 160000 --- a/CraftBukkit +++ b/CraftBukkit @@ -1 +1 @@ -Subproject commit 6247aa00cc50cff563dc17811db1c3f4a9f1487c +Subproject commit f92e01ba5cf46c123d0cd38b29321c78706257e0 diff --git a/Spigot-Server-Patches/Fix-Massive-Memory-Leak.patch b/Spigot-Server-Patches/Fix-Massive-Memory-Leak.patch deleted file mode 100644 index 680f6eeab7..0000000000 --- a/Spigot-Server-Patches/Fix-Massive-Memory-Leak.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Thu, 31 Mar 2016 19:06:47 -0400 -Subject: [PATCH] Fix Massive Memory Leak - -Pathfinder objects are storing references to ChunkCache's, and never cleaning up. - -These ChunkCache's then leak other entity objects. Those entity objects then have leaks to their -own chunk cache. A recursive problem.... - -Clean up the ChunkCache reference after it is done being used. - -diff --git a/src/main/java/net/minecraft/server/PathfinderAbstract.java b/src/main/java/net/minecraft/server/PathfinderAbstract.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/server/PathfinderAbstract.java -+++ b/src/main/java/net/minecraft/server/PathfinderAbstract.java -@@ -0,0 +0,0 @@ public abstract class PathfinderAbstract { - this.f = MathHelper.d(entityinsentient.width + 1.0F); - } - -- public void a() {} -+ public void a() {this.a = (IBlockAccess) null;} // Paper - Fix massive memory leak. Intentionally casting to ensure compile error if obfuscation changes - - protected PathPoint a(int i, int j, int k) { - int l = PathPoint.b(i, j, k); --- \ No newline at end of file