2016-06-19 05:22:12 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Sat, 18 Jun 2016 23:22:12 -0400
|
|
|
|
Subject: [PATCH] Delay Chunk Unloads based on Player Movement
|
|
|
|
|
|
|
|
When players are moving in the world, doing things such as building or exploring,
|
|
|
|
they will commonly go back and forth in a small area. This causes a ton of chunk load
|
|
|
|
and unload activity on the edge chunks of their view distance.
|
|
|
|
|
|
|
|
A simple back and forth movement in 6 blocks could spam a chunk to thrash a
|
|
|
|
loading and unload cycle over and over again.
|
|
|
|
|
|
|
|
This is very wasteful. This system introduces a delay of inactivity on a chunk
|
|
|
|
before it actually unloads, which will be handled by the ticket expiry process.
|
|
|
|
|
|
|
|
This allows servers with smaller worlds who do less long distance exploring to stop
|
|
|
|
wasting cpu cycles on saving/unloading/reloading chunks repeatedly.
|
|
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2020-10-16 23:08:33 +02:00
|
|
|
index ab9170c8440dbd30639c2d451b58583fef13220e..af34b3430d74a8a7e86b7c9ebcd3f734a168da9c 100644
|
2016-06-19 05:22:12 +02:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2020-10-16 23:08:33 +02:00
|
|
|
@@ -625,4 +625,13 @@ public class PaperWorldConfig {
|
2016-06-19 05:22:12 +02:00
|
|
|
private void viewDistance() {
|
|
|
|
this.noTickViewDistance = this.getInt("viewdistances.no-tick-view-distance", -1);
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ public long delayChunkUnloadsBy;
|
|
|
|
+ private void delayChunkUnloadsBy() {
|
|
|
|
+ delayChunkUnloadsBy = PaperConfig.getSeconds(getString("delay-chunk-unloads-by", "10s"));
|
|
|
|
+ if (delayChunkUnloadsBy > 0) {
|
|
|
|
+ log("Delaying chunk unloads by " + delayChunkUnloadsBy + " seconds");
|
|
|
|
+ delayChunkUnloadsBy *= 20;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java
|
2020-08-25 04:22:08 +02:00
|
|
|
index 09fec533d7feebb90e989007dd19c952823550ba..3c7b225edbe23dc1959002293a6f8b816287b5a8 100644
|
2016-06-19 05:22:12 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java
|
|
|
|
@@ -176,6 +176,27 @@ public abstract class ChunkMapDistance {
|
|
|
|
boolean removed = false; // CraftBukkit
|
|
|
|
if (arraysetsorted.remove(ticket)) {
|
|
|
|
removed = true; // CraftBukkit
|
|
|
|
+ // Paper start - delay chunk unloads for player tickets
|
|
|
|
+ long delayChunkUnloadsBy = chunkMap.world.paperConfig.delayChunkUnloadsBy;
|
|
|
|
+ if (ticket.getTicketType() == TicketType.PLAYER && delayChunkUnloadsBy > 0) {
|
|
|
|
+ boolean hasPlayer = false;
|
|
|
|
+ for (Ticket<?> ticket1 : arraysetsorted) {
|
|
|
|
+ if (ticket1.getTicketType() == TicketType.PLAYER) {
|
|
|
|
+ hasPlayer = true;
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ PlayerChunk playerChunk = chunkMap.getUpdatingChunk(i);
|
|
|
|
+ if (!hasPlayer && playerChunk != null && playerChunk.isFullChunkReady()) {
|
|
|
|
+ Ticket<Long> delayUnload = new Ticket<Long>(TicketType.DELAY_UNLOAD, 33, i);
|
|
|
|
+ delayUnload.delayUnloadBy = delayChunkUnloadsBy;
|
|
|
|
+ delayUnload.setCurrentTick(this.currentTick);
|
|
|
|
+ arraysetsorted.remove(delayUnload);
|
|
|
|
+ // refresh ticket
|
|
|
|
+ arraysetsorted.add(delayUnload);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
|
|
|
|
if (arraysetsorted.isEmpty()) {
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Ticket.java b/src/main/java/net/minecraft/server/Ticket.java
|
2020-06-26 03:58:00 +02:00
|
|
|
index b5030d6f5d917ba33fb3c40903384fa7a56bc5f1..e41cb8613efc86499dfe3be36c9130ab6dc9b89e 100644
|
2016-06-19 05:22:12 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/Ticket.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Ticket.java
|
|
|
|
@@ -9,11 +9,13 @@ public final class Ticket<T> implements Comparable<Ticket<?>> {
|
|
|
|
public final T identifier; public final T getObjectReason() { return this.identifier; } // Paper - OBFHELPER
|
|
|
|
private long d; public final long getCreationTick() { return this.d; } // Paper - OBFHELPER
|
|
|
|
public int priority = 0; // Paper
|
|
|
|
+ public long delayUnloadBy; // Paper
|
|
|
|
|
|
|
|
protected Ticket(TicketType<T> tickettype, int i, T t0) {
|
|
|
|
this.a = tickettype;
|
|
|
|
this.b = i;
|
|
|
|
this.identifier = t0;
|
|
|
|
+ this.delayUnloadBy = tickettype.loadPeriod; // Paper
|
|
|
|
}
|
|
|
|
|
|
|
|
public int compareTo(Ticket<?> ticket) {
|
2020-06-26 03:58:00 +02:00
|
|
|
@@ -63,7 +65,7 @@ public final class Ticket<T> implements Comparable<Ticket<?>> {
|
2016-06-19 05:22:12 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
protected boolean b(long i) {
|
|
|
|
- long j = this.a.b();
|
|
|
|
+ long j = delayUnloadBy; // Paper
|
|
|
|
|
|
|
|
return j != 0L && i - this.d > j;
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/TicketType.java b/src/main/java/net/minecraft/server/TicketType.java
|
2020-06-09 09:17:25 +02:00
|
|
|
index 6fd852db6bcfbfbf84ec2acf6d23b08a6051165c..5c789b25f1df2eae8ea8ceb4ba977ba336fe6d5e 100644
|
2016-06-19 05:22:12 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/TicketType.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/TicketType.java
|
2020-06-09 09:17:25 +02:00
|
|
|
@@ -26,6 +26,7 @@ public class TicketType<T> {
|
2016-06-19 05:22:12 +02:00
|
|
|
public static final TicketType<Long> ASYNC_LOAD = a("async_load", Long::compareTo); // Paper
|
|
|
|
public static final TicketType<ChunkCoordIntPair> PRIORITY = a("priority", Comparator.comparingLong(ChunkCoordIntPair::pair), 300); // Paper
|
|
|
|
public static final TicketType<ChunkCoordIntPair> URGENT = a("urgent", Comparator.comparingLong(ChunkCoordIntPair::pair), 300); // Paper
|
|
|
|
+ public static final TicketType<Long> DELAY_UNLOAD = a("delay_unload", Long::compareTo, 300); // Paper
|
|
|
|
|
|
|
|
public static <T> TicketType<T> a(String s, Comparator<T> comparator) {
|
|
|
|
return new TicketType<>(s, comparator, 0L);
|