core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0153-Unmark-chunk-as-unload...

35 lines
1.6 KiB
Diff
Raw Normal View History

Update upstream CB Closes GH-303
2016-05-22 03:07:14 +00:00
From 4cbcf0a94fdb7939154591d342fe7b69fe933176 Mon Sep 17 00:00:00 2001
unmark chunk as unloading when unload is cancelled no obviousy bugs caused by this at the moment, but we may need to clean up process to be like how I use to have it before vanilla did it, and we shouldn't leave this boolean in an invalid state.
2016-05-12 06:07:39 +00:00
From: Aikar <aikar@aikar.co>
Date: Thu, 12 May 2016 02:03:56 -0400
Subject: [PATCH] Unmark chunk as unloading when unload is cancelled
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
Refactor Lighting Queue System may help #284 Cleans up the lighting queue system, reducing diff and improving implementation. We no longer stop chunk unloads due to lighting updates, and instead simply flush the lighting queue. The cost of forcing the chunk (and its neighbors!) to stay loaded waiting for its lighting work to finish is much greater than simply taking the hit and doing the work. This change also helps reduce the diff and avoid bugs with missed diffs by removing duplicated logic. Also switches to a more effecient data structure (ArrayDeque instead of LinkedList) for the queue itself.
2016-05-15 22:48:39 +00:00
index d7b9581..40d4c9c 100644
unmark chunk as unloading when unload is cancelled no obviousy bugs caused by this at the moment, but we may need to clean up process to be like how I use to have it before vanilla did it, and we shouldn't leave this boolean in an invalid state.
2016-05-12 06:07:39 +00:00
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
Refactor Lighting Queue System may help #284 Cleans up the lighting queue system, reducing diff and improving implementation. We no longer stop chunk unloads due to lighting updates, and instead simply flush the lighting queue. The cost of forcing the chunk (and its neighbors!) to stay loaded waiting for its lighting work to finish is much greater than simply taking the hit and doing the work. This change also helps reduce the diff and avoid bugs with missed diffs by removing duplicated logic. Also switches to a more effecient data structure (ArrayDeque instead of LinkedList) for the queue itself.
2016-05-15 22:48:39 +00:00
@@ -47,7 +47,7 @@ public class Chunk {
unmark chunk as unloading when unload is cancelled no obviousy bugs caused by this at the moment, but we may need to clean up process to be like how I use to have it before vanilla did it, and we shouldn't leave this boolean in an invalid state.
2016-05-12 06:07:39 +00:00
private long w;
private int x;
private ConcurrentLinkedQueue<BlockPosition> y;
- public boolean d;
+ public boolean d;public void setShouldUnload(boolean unload) { this.d = unload; } // Paper // OBFHELPER
protected gnu.trove.map.hash.TObjectIntHashMap<Class> entityCount = new gnu.trove.map.hash.TObjectIntHashMap<Class>(); // Spigot
Refactor Lighting Queue System may help #284 Cleans up the lighting queue system, reducing diff and improving implementation. We no longer stop chunk unloads due to lighting updates, and instead simply flush the lighting queue. The cost of forcing the chunk (and its neighbors!) to stay loaded waiting for its lighting work to finish is much greater than simply taking the hit and doing the work. This change also helps reduce the diff and avoid bugs with missed diffs by removing duplicated logic. Also switches to a more effecient data structure (ArrayDeque instead of LinkedList) for the queue itself.
2016-05-15 22:48:39 +00:00
// Paper start
unmark chunk as unloading when unload is cancelled no obviousy bugs caused by this at the moment, but we may need to clean up process to be like how I use to have it before vanilla did it, and we shouldn't leave this boolean in an invalid state.
2016-05-12 06:07:39 +00:00
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
Update upstream CB Closes GH-303
2016-05-22 03:07:14 +00:00
index 6d1b98b..4a2cad6 100644
unmark chunk as unloading when unload is cancelled no obviousy bugs caused by this at the moment, but we may need to clean up process to be like how I use to have it before vanilla did it, and we shouldn't leave this boolean in an invalid state.
2016-05-12 06:07:39 +00:00
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
Update upstream CB Closes GH-303
2016-05-22 03:07:14 +00:00
@@ -309,6 +309,7 @@ public class ChunkProviderServer implements IChunkProvider {
unmark chunk as unloading when unload is cancelled no obviousy bugs caused by this at the moment, but we may need to clean up process to be like how I use to have it before vanilla did it, and we shouldn't leave this boolean in an invalid state.
2016-05-12 06:07:39 +00:00
Chunk chunk = (Chunk) this.chunks.get(olong);
if (chunk != null && chunk.d) {
+ chunk.setShouldUnload(false); // Paper
// CraftBukkit start
ChunkUnloadEvent event = new ChunkUnloadEvent(chunk.bukkitChunk);
Refactor Lighting Queue System may help #284 Cleans up the lighting queue system, reducing diff and improving implementation. We no longer stop chunk unloads due to lighting updates, and instead simply flush the lighting queue. The cost of forcing the chunk (and its neighbors!) to stay loaded waiting for its lighting work to finish is much greater than simply taking the hit and doing the work. This change also helps reduce the diff and avoid bugs with missed diffs by removing duplicated logic. Also switches to a more effecient data structure (ArrayDeque instead of LinkedList) for the queue itself.
2016-05-15 22:48:39 +00:00
this.world.getServer().getPluginManager().callEvent(event);
unmark chunk as unloading when unload is cancelled no obviousy bugs caused by this at the moment, but we may need to clean up process to be like how I use to have it before vanilla did it, and we shouldn't leave this boolean in an invalid state.
2016-05-12 06:07:39 +00:00
--
Update upstream CB Closes GH-303
2016-05-22 03:07:14 +00:00
2.8.2.windows.1
unmark chunk as unloading when unload is cancelled no obviousy bugs caused by this at the moment, but we may need to clean up process to be like how I use to have it before vanilla did it, and we shouldn't leave this boolean in an invalid state.
2016-05-12 06:07:39 +00:00