aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-Server-Patches/0152-Unmark-chunk-as-unloading-when-unload-is-cancelled.patch
diff options
context:
space:
mode:
Diffstat (limited to 'Spigot-Server-Patches/0152-Unmark-chunk-as-unloading-when-unload-is-cancelled.patch')
-rw-r--r--Spigot-Server-Patches/0152-Unmark-chunk-as-unloading-when-unload-is-cancelled.patch34
1 files changed, 0 insertions, 34 deletions
diff --git a/Spigot-Server-Patches/0152-Unmark-chunk-as-unloading-when-unload-is-cancelled.patch b/Spigot-Server-Patches/0152-Unmark-chunk-as-unloading-when-unload-is-cancelled.patch
deleted file mode 100644
index 31f29e71c4..0000000000
--- a/Spigot-Server-Patches/0152-Unmark-chunk-as-unloading-when-unload-is-cancelled.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 315afb375674d27304fae4183a583984e739055f Mon Sep 17 00:00:00 2001
-From: Aikar <[email protected]>
-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
-index d7b9581..40d4c9c 100644
---- a/src/main/java/net/minecraft/server/Chunk.java
-+++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -47,7 +47,7 @@ public class Chunk {
- 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
-
- // Paper start
-diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 6d1b98b..4a2cad6 100644
---- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
-+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -309,6 +309,7 @@ public class ChunkProviderServer implements IChunkProvider {
- Chunk chunk = (Chunk) this.chunks.get(olong);
-
- if (chunk != null && chunk.d) {
-+ chunk.setShouldUnload(false); // Paper
- // CraftBukkit start
- ChunkUnloadEvent event = new ChunkUnloadEvent(chunk.bukkitChunk);
- this.world.getServer().getPluginManager().callEvent(event);
---
-2.7.4 (Apple Git-66)
-