Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-07 08:02:13 +01:00
Code Issues Projects Releases Wiki Activity

Fix Chunks unloading immediately for priority access - Fixes #3461

Browse Source 
Adding a priority ticket was apparently causing the level tracker
to immediately unload the chunk.

That code is scary
This commit is contained in:
Aikar 2020-05-28 22:57:27 -04:00
parent 8e9b42b127
commit 0ef7812813
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Spigot-Server-Patches/Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
View File

@ -133,11 +133,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
ticket1.a(this.currentTick); ticket1.a(this.currentTick);
- if (ticket.b() < j) { - if (ticket.b() < j) {
+ if (ticket.getTicketLevel() < j || ticket.getTicketType() == TicketType.URGENT || (ticket.getTicketType() == TicketType.PRIORITY && ticket.getTicketLevel() - ticket.priority < j)) { // Paper - check priority tickets too + if (ticket.getTicketLevel() < j) {
this.e.b(i, ticket.b(), true); this.e.b(i, ticket.b(), true);
+ // Paper start - queue update if priority ticket add
+ } else if (ticket.getTicketType() == TicketType.URGENT || ticket.getTicketType() == TicketType.PRIORITY) {
+ PlayerChunk updatingChunk = chunkMap.getUpdatingChunk(i);
+ if (updatingChunk != null) {
+ pendingChunkUpdates.add(updatingChunk);
+ }
+ // Paper end
} }
@@ -0,0 +0,0 @@ public abstract class ChunkMapDistance { return ticket == ticket1; // CraftBukkit
} }
private boolean removeTicket(long i, Ticket<?> ticket) { // CraftBukkit - void -> boolean private boolean removeTicket(long i, Ticket<?> ticket) { // CraftBukkit - void -> boolean