From 578af648279e8f4693e6d28fb0eea4b71161baef 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 +- ...Do-not-load-chunks-for-light-checks.patch} | 2 +- .../0124-Fix-Massive-Memory-Leak.patch | 28 ------------------- 3 files changed, 2 insertions(+), 30 deletions(-) rename Spigot-Server-Patches/{0125-Do-not-load-chunks-for-light-checks.patch => 0124-Do-not-load-chunks-for-light-checks.patch} (93%) delete mode 100644 Spigot-Server-Patches/0124-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/0125-Do-not-load-chunks-for-light-checks.patch b/Spigot-Server-Patches/0124-Do-not-load-chunks-for-light-checks.patch similarity index 93% rename from Spigot-Server-Patches/0125-Do-not-load-chunks-for-light-checks.patch rename to Spigot-Server-Patches/0124-Do-not-load-chunks-for-light-checks.patch index 0e645212f9..5d8327afc1 100644 --- a/Spigot-Server-Patches/0125-Do-not-load-chunks-for-light-checks.patch +++ b/Spigot-Server-Patches/0124-Do-not-load-chunks-for-light-checks.patch @@ -1,4 +1,4 @@ -From ea50a2f4bccc3f86ce363e53f345acc3b434b8bb Mon Sep 17 00:00:00 2001 +From 26605472c71f3844ee15539ee80f49d6234ce140 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 31 Mar 2016 19:17:58 -0400 Subject: [PATCH] Do not load chunks for light checks diff --git a/Spigot-Server-Patches/0124-Fix-Massive-Memory-Leak.patch b/Spigot-Server-Patches/0124-Fix-Massive-Memory-Leak.patch deleted file mode 100644 index 671dee33f4..0000000000 --- a/Spigot-Server-Patches/0124-Fix-Massive-Memory-Leak.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a4e295c985a50926d5e66a184fc764f4aa301d6a 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 d579577..40e5b4d 100644 ---- a/src/main/java/net/minecraft/server/PathfinderAbstract.java -+++ b/src/main/java/net/minecraft/server/PathfinderAbstract.java -@@ -23,7 +23,7 @@ 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); --- -2.8.0 -