2020-05-06 11:48:49 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2020-04-09 03:13:48 +02:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Wed, 8 Apr 2020 21:07:08 -0400
|
|
|
|
Subject: [PATCH] Don't load chunks when attempting to unload a chunk
|
|
|
|
|
|
|
|
Big Brain Logic
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2020-05-10 04:30:28 +02:00
|
|
|
index e0e1f88bd4555c721f6faa9e39d1cb9e2680e969..3f70d99af9ed63d704cd58c1614b092b17f69408 100644
|
2020-04-09 03:13:48 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2020-05-10 04:30:28 +02:00
|
|
|
@@ -474,7 +474,7 @@ public class CraftWorld implements World {
|
2020-04-09 03:13:48 +02:00
|
|
|
@Override
|
|
|
|
public boolean unloadChunkRequest(int x, int z) {
|
|
|
|
org.spigotmc.AsyncCatcher.catchOp("chunk unload"); // Spigot
|
|
|
|
- net.minecraft.server.IChunkAccess chunk = world.getChunkProvider().getChunkAt(x, z, ChunkStatus.FULL, false);
|
|
|
|
+ net.minecraft.server.IChunkAccess chunk = world.getChunkProvider().getChunkAtIfLoadedImmediately(x, z); // Paper
|
|
|
|
if (chunk != null) {
|
|
|
|
world.getChunkProvider().removeTicket(TicketType.PLUGIN, chunk.getPos(), 1, Unit.INSTANCE);
|
|
|
|
}
|
2020-05-10 04:30:28 +02:00
|
|
|
@@ -484,7 +484,7 @@ public class CraftWorld implements World {
|
2020-04-09 03:13:48 +02:00
|
|
|
|
|
|
|
private boolean unloadChunk0(int x, int z, boolean save) {
|
|
|
|
org.spigotmc.AsyncCatcher.catchOp("chunk unload"); // Spigot
|
|
|
|
- net.minecraft.server.Chunk chunk = (net.minecraft.server.Chunk) world.getChunkProvider().getChunkAt(x, z, ChunkStatus.FULL, false);
|
|
|
|
+ net.minecraft.server.Chunk chunk = world.getChunkProvider().getChunkAtIfLoadedImmediately(x, z); // Paper
|
|
|
|
if (chunk == null) {
|
|
|
|
return true;
|
|
|
|
}
|