2020-09-10 20:35:41 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Ivan Pekov <ivan@mrivanplays.com>
|
|
|
|
Date: Thu, 10 Sep 2020 21:02:26 +0300
|
|
|
|
Subject: [PATCH] Fix LightEngineThreaded memory leak
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/LightEngineThreaded.java b/src/main/java/net/minecraft/server/LightEngineThreaded.java
|
2020-09-20 20:45:23 +02:00
|
|
|
index fd0beefb900c064d3c35a3d2f79f5b7d9c1287bb..4d024a4849b7566c0faba131caab57b4ddf35e29 100644
|
2020-09-10 20:35:41 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/LightEngineThreaded.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/LightEngineThreaded.java
|
2020-09-20 20:45:23 +02:00
|
|
|
@@ -104,6 +104,8 @@ public class LightEngineThreaded extends LightEngine implements AutoCloseable {
|
2020-09-10 20:35:41 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
+ public final void remove(long chunkId) { pendingTasks.removeIf(task -> task.chunkId == chunkId); queueUpdate(); } // Yatopia
|
|
|
|
+
|
|
|
|
public final boolean isEmpty() {
|
|
|
|
return this.size == 0 && this.pendingTasks.isEmpty();
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
2020-09-20 20:45:23 +02:00
|
|
|
index a21322ffd0bbb0c24b45cac9e2992c44d9c2977a..d53a9aa95c00b1ca7cf98fc88f49e3debff691a8 100644
|
2020-09-10 20:35:41 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
2020-09-17 13:42:54 +02:00
|
|
|
@@ -1815,6 +1815,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
|
2020-09-10 20:35:41 +02:00
|
|
|
}
|
|
|
|
// Paper end
|
|
|
|
|
|
|
|
+ chunkProvider.getLightEngine().queue.remove(chunk.getPos().pair()); // Yatopia - unregister from light queue
|
|
|
|
}
|
|
|
|
|
|
|
|
public void unregisterEntity(Entity entity) {
|