mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 18:37:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appears to apply and compile correctly Paper Changes: d6eda567 Provide a useful PluginClassLoader#toString a3fdafbd Restore Serialization Improvements again, wasn't an issue. 0e441c79 Revert "Improve Chat Component Legacy Serialization more" 53ef67b8 Improve Chat Component Legacy Serialization more afc1fcfc Fix serialization of colors from components eaa76a31 Add Villager Tasks to EAR inactive tick to keep behavior 357b52fd Improve Chunk Prioritization / Load Order a76bc402 Improve Chunk Status Transition Speed 7a2b345b Synchronize DataPaletteBlock instead of ReentrantLock
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 0676e1e882ad34b6ea8cd6fc7455919c2d34ccc9 Mon Sep 17 00:00:00 2001
|
||||
From 144050f232129d11c7b35d33d71b9a9951dab870 Mon Sep 17 00:00:00 2001
|
||||
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
||||
Date: Fri, 25 Oct 2019 02:11:30 -0700
|
||||
Subject: [PATCH] Tuinity - Delay chunk unloads
|
||||
@@ -35,7 +35,7 @@ index 55f9f4e6e7..ac21fdb4c9 100644
|
||||
this.a(ChunkCoordIntPair.a, i, j, flag);
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java
|
||||
index 9805361e2d..3ad0177d2a 100644
|
||||
index 8a319f6e60..6e7a1c3386 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java
|
||||
@@ -31,7 +31,7 @@ public abstract class ChunkMapDistance {
|
||||
@@ -134,7 +134,7 @@ index 9805361e2d..3ad0177d2a 100644
|
||||
private static int a(ArraySetSorted<Ticket<?>> arraysetsorted) {
|
||||
AsyncCatcher.catchOp("ChunkMapDistance::getHighestTicketLevel"); // Paper
|
||||
return !arraysetsorted.isEmpty() ? ((Ticket) arraysetsorted.b()).b() : PlayerChunkMap.GOLDEN_TICKET + 1;
|
||||
@@ -182,6 +241,11 @@ public abstract class ChunkMapDistance {
|
||||
@@ -175,6 +234,11 @@ public abstract class ChunkMapDistance {
|
||||
boolean removed = false; // CraftBukkit
|
||||
if (arraysetsorted.remove(ticket)) {
|
||||
removed = true; // CraftBukkit
|
||||
|
||||
Reference in New Issue
Block a user