mirror/Purpur
2
0
Fork 0
mirror of https://github.com/PurpurMC/Purpur.git synced 2025-02-17 13:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@a76998d Fix plugin loggers on shutdown (#5592)
This commit is contained in:
BillyGalbreath 2022-08-22 15:55:20 -05:00
parent e599e96628
commit 868748e16f
No known key found for this signature in database
GPG Key ID: 1968A5C4D57BB3FA
17 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -1,7 +1,7 @@
group = org.purpurmc.purpur
version = 1.19.2-R0.1-SNAPSHOT
paperCommit = 2da891fcfacf585956781cb0f5694605d75dba60
paperCommit = a76998d2354e0fb3ff91cd817c3162a2bc878ce0
org.gradle.caching = true
org.gradle.parallel = true

8
patches/server/0001-Pufferfish-Server-Changes.patch
View File

@ -2783,7 +2783,7 @@ index 7034af8ad42940c5af6b9032b9873ce36c55a2a7..c0fdc5a79107f8694a514a12d5526bd4
public static long getCoordinateKey(final ChunkPos pair) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index dd9ab51e904be2f2f2a2981d4f0f6638a6895e8d..e7fcef13bfbbe7745ea39f1ceaf7652459dde8b9 100644
index d2161a3c3b9a2b2d463ac778656c95167c10a49d..92f685b1b6015cdd3e6c50fd39a79e2ad187fc91 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -298,6 +298,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@ -2795,7 +2795,7 @@ index dd9ab51e904be2f2f2a2981d4f0f6638a6895e8d..e7fcef13bfbbe7745ea39f1ceaf76524
public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
AtomicReference<S> atomicreference = new AtomicReference();
@@ -1672,7 +1674,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1673,7 +1675,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@ -2804,7 +2804,7 @@ index dd9ab51e904be2f2f2a2981d4f0f6638a6895e8d..e7fcef13bfbbe7745ea39f1ceaf76524
}
public SystemReport fillSystemReport(SystemReport details) {
@@ -2251,6 +2253,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2252,6 +2254,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public ProfilerFiller getProfiler() {
@ -5738,7 +5738,7 @@ index 909b2c98e7a9117d2f737245e4661792ffafb744..0d9e2b3728f9ab500bd5e44702718535
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 0a4e9b0957c9b0abbb88d472b5b3d7946c256af2..522c519752d2fdb838bd797c77fdc7d0934b51e9 100644
index 1628913b1e9b91e68dcd942a38da4aed95b12d4a..05cc8f9cdcd7e920bf9503f68efb16cd74a359a2 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -430,7 +430,7 @@ public final class CraftMagicNumbers implements UnsafeValues {

6
patches/server/0003-Rebrand.patch
View File

@ -168,7 +168,7 @@ index abe37c7c3c6f5ab73afd738ec78f06d7e4d2ed96..b5b6657e52e4f7a630229bd3ba433438
stringbuilder.append(CrashReport.getErrorComment());
stringbuilder.append("\n\n");
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index e7fcef13bfbbe7745ea39f1ceaf7652459dde8b9..212ce23d04cadc695e729c09e2dec7179929ca71 100644
index 92f685b1b6015cdd3e6c50fd39a79e2ad187fc91..98a166edfda01f5e07a144a34fd57f0e83b8893c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -298,7 +298,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@ -189,7 +189,7 @@ index e7fcef13bfbbe7745ea39f1ceaf7652459dde8b9..212ce23d04cadc695e729c09e2dec717
while (this.getRunningThread().isAlive()) {
this.getRunningThread().stop();
try {
@@ -1674,7 +1674,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1675,7 +1675,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@ -297,7 +297,7 @@ index cdefb2025eedea7e204d70d568adaf1c1ec4c03c..d1526ed7197b883e1d1f07baf285bf5e
// (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 522c519752d2fdb838bd797c77fdc7d0934b51e9..03382a35e5b22b871ba945687c4030c5cf091625 100644
index 05cc8f9cdcd7e920bf9503f68efb16cd74a359a2..0b248a987d22da21aa802c5dba00b4f987c365ea 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -430,7 +430,7 @@ public final class CraftMagicNumbers implements UnsafeValues {

6
patches/server/0004-Purpur-config-files.patch
View File

@ -105,7 +105,7 @@ index b6f5d2aa4c6edb61421a553211ce71592d8c767a..9d68706d23da00700a89b533e9efefa3
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7424f3f2f9942170d1f0b98e61b5712901d2fd60..c1a8ac2abf79075f4ea70d2cfe1fc577e0e92271 100644
index 27b2416f725a57fcdc14378e7c14713978e51783..14669d51d624e7af1a06cff07f451524160687b3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -961,6 +961,7 @@ public final class CraftServer implements Server {
@ -152,10 +152,10 @@ index 7424f3f2f9942170d1f0b98e61b5712901d2fd60..c1a8ac2abf79075f4ea70d2cfe1fc577
public void restart() {
org.spigotmc.RestartCommand.restart();
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 5b48047242e20c216b110502935763ea433c55cd..40d86147d4bfcab81c2b4e2d70f5ccdb8e25e606 100644
index 56a784e943cb5d8b15b41e3e66545ebf166c221c..64489713611840abb069957dcdb495c60c990059 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -158,6 +158,14 @@ public class Main {
@@ -164,6 +164,14 @@ public class Main {
.describedAs("Jar file");
// Paper end

4
patches/server/0008-Ridables.patch
View File

@ -22,10 +22,10 @@ index 153451ecd5b3c8e8ecb2d5ec91ccd582d4300899..56536c39bccfe097f8227c74a0d16799
super(x, y, z);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 212ce23d04cadc695e729c09e2dec7179929ca71..246ce99830ba803abe487e3c43f453e75d9c5c1f 100644
index 98a166edfda01f5e07a144a34fd57f0e83b8893c..50d077470a3a606b97ea4ae499837de654ecb984 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1535,6 +1535,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1536,6 +1536,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
ServerLevel worldserver = (ServerLevel) iterator.next();
worldserver.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
worldserver.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper

4
patches/server/0014-Configurable-server-mod-name.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Configurable server mod name
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 246ce99830ba803abe487e3c43f453e75d9c5c1f..298e63f4acdcd52158eff83c5ee60846c6628e29 100644
index 50d077470a3a606b97ea4ae499837de654ecb984..28550587d7b3f3fd48b2ebaaafd8ed847a86082f 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1675,7 +1675,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1676,7 +1676,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {

6
patches/server/0016-Lagging-threshold.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Lagging threshold
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 48bf3a9938aae8d6cc847a80cf95cfda305414f5..0d57f093490e7db8d4d726111ba94e9edbceeda9 100644
index 28550587d7b3f3fd48b2ebaaafd8ed847a86082f..610f3ba3a983144b8b7f56e39d1c60bde6f35491 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -294,6 +294,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@ -16,7 +16,7 @@ index 48bf3a9938aae8d6cc847a80cf95cfda305414f5..0d57f093490e7db8d4d726111ba94e9e
public volatile Thread shutdownThread; // Paper
public volatile boolean abnormalExit = false; // Paper
@@ -1177,6 +1178,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1178,6 +1179,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.recentTps[1] = tps5.getAverage();
this.recentTps[2] = tps15.getAverage();
// Paper end
@ -25,7 +25,7 @@ index 48bf3a9938aae8d6cc847a80cf95cfda305414f5..0d57f093490e7db8d4d726111ba94e9e
}
// Spigot end
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0f441589561bff0d2f21bf1a1d764422a34ecbee..2369be0c9d8cd07c9c1a923736133e53c4b770a5 100644
index 7e66b58c607257ba4b7c047291b6bf115d5a200d..9bfd75df68a6cbad81cf933a448f5741d9d90b92 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2932,5 +2932,10 @@ public final class CraftServer implements Server {

4
patches/server/0027-Disable-outdated-build-check.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Disable outdated build check
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 40d86147d4bfcab81c2b4e2d70f5ccdb8e25e606..5199e59c606833f90610f7360121e9628abafe2e 100644
index 64489713611840abb069957dcdb495c60c990059..420300ce19d01f36f071eae44efd4cb32beb0ed6 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -270,7 +270,7 @@ public class Main {
@@ -276,7 +276,7 @@ public class Main {
System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper
}

4
patches/server/0052-Configurable-TPS-Catchup.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Configurable TPS Catchup
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0d57f093490e7db8d4d726111ba94e9edbceeda9..35bd4446652d291c77174c0aa366a9030d5b0bcc 100644
index 610f3ba3a983144b8b7f56e39d1c60bde6f35491..9ff46c460f09bf3e62f958a4a87632d59a310e24 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1196,7 +1196,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1197,7 +1197,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.tickServer(this::haveTime);
this.profiler.popPush("nextTickWait");
this.mayHaveDelayedTasks = true;

8
patches/server/0065-Add-5-second-tps-average-in-tps.patch
View File

@ -27,7 +27,7 @@ index fa56cd09102a89692b42f1d14257990508c5c720..f9251183df72ddc56662fd3f02acf216
setListData(vector);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 35bd4446652d291c77174c0aa366a9030d5b0bcc..f810ed88c9d1d092308cfde748d0b18bc5f63a8b 100644
index 9ff46c460f09bf3e62f958a4a87632d59a310e24..b1098555ea7c96815dc85ab440544d9db7fee978 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -290,7 +290,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@ -39,7 +39,7 @@ index 35bd4446652d291c77174c0aa366a9030d5b0bcc..f810ed88c9d1d092308cfde748d0b18b
// Spigot end
public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations;
public static long currentTickLong = 0L; // Paper
@@ -1075,6 +1075,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1076,6 +1076,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
private static final long MAX_CATCHUP_BUFFER = TICK_TIME * TPS * 60L;
private long lastTick = 0;
private long catchupTime = 0;
@ -47,7 +47,7 @@ index 35bd4446652d291c77174c0aa366a9030d5b0bcc..f810ed88c9d1d092308cfde748d0b18b
public final RollingAverage tps1 = new RollingAverage(60);
public final RollingAverage tps5 = new RollingAverage(60 * 5);
public final RollingAverage tps15 = new RollingAverage(60 * 15);
@@ -1170,13 +1171,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1171,13 +1172,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
{
final long diff = curTime - tickSection;
java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);
@ -69,7 +69,7 @@ index 35bd4446652d291c77174c0aa366a9030d5b0bcc..f810ed88c9d1d092308cfde748d0b18b
lagging = recentTps[0] < org.purpurmc.purpur.PurpurConfig.laggingThreshold; // Purpur
tickSection = curTime;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 2369be0c9d8cd07c9c1a923736133e53c4b770a5..85bac0c88b981d6bfec0e36066779ee8c4ed0583 100644
index 9bfd75df68a6cbad81cf933a448f5741d9d90b92..f61aa1a5139c1a39c6825a135a48e9cc937b0671 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2693,6 +2693,7 @@ public final class CraftServer implements Server {

6
patches/server/0103-Configurable-daylight-cycle.patch
View File

@ -18,10 +18,10 @@ index 689ad22925b2561f7c8db961743eb1f821dbb25f..fa3c960992cc240161817e54659d83fe
public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) {
this.gameTime = time % 192000; // Paper - fix guardian beam
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index f810ed88c9d1d092308cfde748d0b18bc5f63a8b..b757c09223e2937a1fa06edd8e1bad63ed122620 100644
index b1098555ea7c96815dc85ab440544d9db7fee978..eb12fed7ee6d7d3a5f5b9e99d8f11b38122cac7e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1530,7 +1530,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1531,7 +1531,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
long worldTime = world.getGameTime();
final ClientboundSetTimePacket worldPacket = new ClientboundSetTimePacket(worldTime, dayTime, doDaylight);
for (Player entityhuman : world.players()) {
@ -31,7 +31,7 @@ index f810ed88c9d1d092308cfde748d0b18bc5f63a8b..b757c09223e2937a1fa06edd8e1bad63
}
ServerPlayer entityplayer = (ServerPlayer) entityhuman;
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 28fd992a8ddc2089f7a7e87e14ef271d453ac4bb..38fe99c7b8db25933081d741553ded03722c177f 100644
index 5b6e2fcf0f8fc854c08dcdf40bdae91fd8d405f5..64edb1e92e9203f4e0a691adc69bdbbe8ec36607 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -211,6 +211,8 @@ public class ServerLevel extends Level implements WorldGenLevel {

6
patches/server/0125-Implement-TPSBar.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Implement TPSBar
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index 5e3d903da89ddebb7aae82347ff26e60de1905e8..2b61c6fb67141234708707eb07621681f7d8e9b2 100644
index ab0f00128f8c1b13c3eb5787df0c4e26372e0734..14b12cb6967c1c2735cf6a0eafdf6e23889a528c 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -210,6 +210,7 @@ public class Commands {
@ -17,10 +17,10 @@ index 5e3d903da89ddebb7aae82347ff26e60de1905e8..2b61c6fb67141234708707eb07621681
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index b757c09223e2937a1fa06edd8e1bad63ed122620..4fbc86086d085681918dc9e6ddfbcad647137948 100644
index eb12fed7ee6d7d3a5f5b9e99d8f11b38122cac7e..872632875d1569dd348c78983b260ebeb746b829 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1049,6 +1049,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1050,6 +1050,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.safeShutdown(flag, false);
}
public void safeShutdown(boolean flag, boolean isRestarting) {

4
patches/server/0251-Give-bee-counts-in-beehives-to-Purpur-clients.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Give bee counts in beehives to Purpur clients
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 4503261e2a7b5bdff09212b5ab540c5544287908..89c672b03e7bc932e2afb46e708a49a8fe66ff76 100644
index d950b72b7287b857cb849c1a2fc931fa7d30f25f..ad75fb1e1d8c91b46c98fc666f12b72fcdfb0df9 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1060,6 +1060,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1061,6 +1061,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public void safeShutdown(boolean flag, boolean isRestarting) {
org.purpurmc.purpur.task.BossBarTask.stopAll(); // Purpur

4
patches/server/0286-Allow-custom-ChatDecorators.patch
View File

@ -6,10 +6,10 @@ Subject: [PATCH] Allow custom ChatDecorators
Requires NMS to utilize. I'll write an API for this once our upstreams calm down with the changes.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index be18103099ba47711bcd36c6f9379fb3d05aaa4e..508a3fa75a900fb5dc7729aebd3b9c7116aac66c 100644
index ad75fb1e1d8c91b46c98fc666f12b72fcdfb0df9..8f1d6493700365d651c915f78e34fd5b13264c3c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -2645,6 +2645,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2646,6 +2646,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
new com.google.common.util.concurrent.ThreadFactoryBuilder().setDaemon(true).setNameFormat("Async Chat Thread - #%d").setUncaughtExceptionHandler(new net.minecraft.DefaultUncaughtExceptionHandlerWithName(net.minecraft.server.MinecraftServer.LOGGER)).build()); // Paper
public ChatDecorator getChatDecorator() {

4
patches/server/0287-Cache-server-motd.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Cache server motd
Paper ported my patch in an odd way. Keeping my patch around to reduce logic on the motd getter
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 508a3fa75a900fb5dc7729aebd3b9c7116aac66c..7febaa45e5d4e3bbf4a506f2049dd2fd45573b0e 100644
index 8f1d6493700365d651c915f78e34fd5b13264c3c..63660814d0ba4090f52146119707f04d8b905f18 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -234,7 +234,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@ -18,7 +18,7 @@ index 508a3fa75a900fb5dc7729aebd3b9c7116aac66c..7febaa45e5d4e3bbf4a506f2049dd2fd
private int playerIdleTimeout;
public final long[] tickTimes;
// Paper start
@@ -1902,17 +1902,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1903,17 +1903,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public net.kyori.adventure.text.Component getComponentMotd() {

18
patches/server/0288-Remove-Timings.patch
View File

@ -103,10 +103,10 @@ index 8bc0cb9ad5bb4e76d962ff54305e2c08e279a17b..e8efbbeece7e866c6c4d7489677d2d9e
PacketUtils.LOGGER.debug("Ignoring packet due to disconnection: {}", packet);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 7febaa45e5d4e3bbf4a506f2049dd2fd45573b0e..3ac653f12287fd8ad8966017d3faab2541cfd3b6 100644
index 63660814d0ba4090f52146119707f04d8b905f18..c340f7577435d59ae46455a2b94521bc401aeaa9 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1427,15 +1427,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1428,15 +1428,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
public void onServerExit() {}
public void tickServer(BooleanSupplier shouldKeepTicking) {
@ -125,7 +125,7 @@ index 7febaa45e5d4e3bbf4a506f2049dd2fd45573b0e..3ac653f12287fd8ad8966017d3faab25
// Paper end
new com.destroystokyo.paper.event.server.ServerTickStartEvent(this.tickCount+1).callEvent(); // Paper
@@ -1487,9 +1487,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1488,9 +1488,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
// Paper end
io.papermc.paper.util.CachedLists.reset(); // Paper
// Paper start - move executeAll() into full server tick timing
@ -137,7 +137,7 @@ index 7febaa45e5d4e3bbf4a506f2049dd2fd45573b0e..3ac653f12287fd8ad8966017d3faab25
// Paper end
// Paper start
long endTime = System.nanoTime();
@@ -1511,29 +1511,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1512,29 +1512,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.frameTimer.logFrameDuration(i1 - i);
this.profiler.pop();
org.spigotmc.WatchdogThread.tick(); // Spigot
@ -175,7 +175,7 @@ index 7febaa45e5d4e3bbf4a506f2049dd2fd45573b0e..3ac653f12287fd8ad8966017d3faab25
// Send time updates to everyone, it will get the right time from the world the player is in.
// Paper start - optimize time updates
for (final ServerLevel world : this.getAllLevels()) {
@@ -1553,7 +1553,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1554,7 +1554,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
}
// Paper end
@ -184,7 +184,7 @@ index 7febaa45e5d4e3bbf4a506f2049dd2fd45573b0e..3ac653f12287fd8ad8966017d3faab25
this.isIteratingOverLevels = true; // Paper
while (iterator.hasNext()) {
@@ -1577,14 +1577,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1578,14 +1578,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.profiler.push("tick");
try {
@ -201,7 +201,7 @@ index 7febaa45e5d4e3bbf4a506f2049dd2fd45573b0e..3ac653f12287fd8ad8966017d3faab25
} catch (Throwable throwable) {
// Spigot Start
CrashReport crashreport;
@@ -1607,24 +1607,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1608,24 +1608,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.isIteratingOverLevels = false; // Paper
this.profiler.popPush("connection");
@ -232,7 +232,7 @@ index 7febaa45e5d4e3bbf4a506f2049dd2fd45573b0e..3ac653f12287fd8ad8966017d3faab25
this.profiler.pop();
}
@@ -2783,7 +2783,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2784,7 +2784,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
return;
}
@ -241,7 +241,7 @@ index 7febaa45e5d4e3bbf4a506f2049dd2fd45573b0e..3ac653f12287fd8ad8966017d3faab25
try {
for (;;) {
boolean moreTasks = this.tickMidTickTasks();
@@ -2810,7 +2810,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2811,7 +2811,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
}
} finally {

34
patches/server/0289-Remove-Mojang-Profiler.patch
View File

@ -39,7 +39,7 @@ index edd378813873ed367784379b0f1666d1ccf2194d..eb4dac2239592d680ef31edf47f1ab66
return b0;
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 3ac653f12287fd8ad8966017d3faab2541cfd3b6..3d30dbb66d05f76545e119243cba4d549cbae714 100644
index c340f7577435d59ae46455a2b94521bc401aeaa9..24f767663b1190dcada3da554375e3a01064c462 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -328,13 +328,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@ -74,7 +74,7 @@ index 3ac653f12287fd8ad8966017d3faab2541cfd3b6..3d30dbb66d05f76545e119243cba4d54
MinecraftServer.LOGGER.info("Stopping server");
Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Shutdown and don't bother finishing
@@ -1200,18 +1200,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1201,18 +1201,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
// Spigot end
@ -98,7 +98,7 @@ index 3ac653f12287fd8ad8966017d3faab2541cfd3b6..3d30dbb66d05f76545e119243cba4d54
this.mayHaveDelayedTasks = true;
// Purpur start - tps catchup
if (org.purpurmc.purpur.PurpurConfig.tpsCatchup) {
@@ -1221,8 +1221,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1222,8 +1222,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
// Purpur end - tps catchup
this.waitUntilNextTick();
@ -109,7 +109,7 @@ index 3ac653f12287fd8ad8966017d3faab2541cfd3b6..3d30dbb66d05f76545e119243cba4d54
this.isReady = true;
JvmProfiler.INSTANCE.onServerTick(this.averageTickTime);
}
@@ -1383,7 +1383,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1384,7 +1384,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public void doRunTask(TickTask ticktask) { // CraftBukkit - decompile error
@ -118,7 +118,7 @@ index 3ac653f12287fd8ad8966017d3faab2541cfd3b6..3d30dbb66d05f76545e119243cba4d54
super.doRunTask(ticktask);
}
@@ -1468,7 +1468,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1469,7 +1469,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
if (playerSaveInterval < 0) {
playerSaveInterval = autosavePeriod;
}
@ -127,7 +127,7 @@ index 3ac653f12287fd8ad8966017d3faab2541cfd3b6..3d30dbb66d05f76545e119243cba4d54
final boolean fullSave = autosavePeriod > 0 && this.tickCount % autosavePeriod == 0;
try {
this.isSaving = true;
@@ -1483,7 +1483,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1484,7 +1484,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
} finally {
this.isSaving = false;
}
@ -136,7 +136,7 @@ index 3ac653f12287fd8ad8966017d3faab2541cfd3b6..3d30dbb66d05f76545e119243cba4d54
// Paper end
io.papermc.paper.util.CachedLists.reset(); // Paper
// Paper start - move executeAll() into full server tick timing
@@ -1496,7 +1496,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1497,7 +1497,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
long remaining = (TICK_TIME - (endTime - lastTick)) - catchupTime;
new com.destroystokyo.paper.event.server.ServerTickEndEvent(this.tickCount, ((double)(endTime - lastTick) / 1000000D), remaining).callEvent();
// Paper end
@ -145,7 +145,7 @@ index 3ac653f12287fd8ad8966017d3faab2541cfd3b6..3d30dbb66d05f76545e119243cba4d54
long l = this.tickTimes[this.tickCount % 100] = Util.getNanos() - i;
this.averageTickTime = this.averageTickTime * 0.8F + (float) l / 1000000.0F * 0.19999999F;
@@ -1509,7 +1509,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1510,7 +1510,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
// Paper end
this.frameTimer.logFrameDuration(i1 - i);
@ -154,7 +154,7 @@ index 3ac653f12287fd8ad8966017d3faab2541cfd3b6..3d30dbb66d05f76545e119243cba4d54
org.spigotmc.WatchdogThread.tick(); // Spigot
//co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTiming(); // Paper // Purpur
}
@@ -1518,11 +1518,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1519,11 +1519,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
//MinecraftTimings.bukkitSchedulerTimer.startTiming(); // Spigot // Paper // Purpur
this.server.getScheduler().mainThreadHeartbeat(this.tickCount); // CraftBukkit
//MinecraftTimings.bukkitSchedulerTimer.stopTiming(); // Spigot // Paper // Purpur
@ -168,7 +168,7 @@ index 3ac653f12287fd8ad8966017d3faab2541cfd3b6..3d30dbb66d05f76545e119243cba4d54
Iterator iterator = this.getAllLevels().iterator();
// CraftBukkit start
@@ -1563,18 +1563,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1564,18 +1564,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
worldserver.hasRidableMoveEvent = org.purpurmc.purpur.event.entity.RidableMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Purpur
net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper
@ -192,7 +192,7 @@ index 3ac653f12287fd8ad8966017d3faab2541cfd3b6..3d30dbb66d05f76545e119243cba4d54
try {
//worldserver.timings.doTick.startTiming(); // Spigot // Purpur
@@ -1600,17 +1600,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1601,17 +1601,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
throw new ReportedException(crashreport);
}
@ -214,7 +214,7 @@ index 3ac653f12287fd8ad8966017d3faab2541cfd3b6..3d30dbb66d05f76545e119243cba4d54
//MinecraftTimings.playerListTimer.startTiming(); // Spigot // Paper // Purpur
this.playerList.tick();
//MinecraftTimings.playerListTimer.stopTiming(); // Spigot // Paper // Purpur
@@ -1618,7 +1618,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1619,7 +1619,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
GameTestTicker.SINGLETON.tick();
}
@ -223,7 +223,7 @@ index 3ac653f12287fd8ad8966017d3faab2541cfd3b6..3d30dbb66d05f76545e119243cba4d54
//MinecraftTimings.tickablesTimer.startTiming(); // Spigot // Paper // Purpur
for (int i = 0; i < this.tickables.size(); ++i) {
@@ -1626,7 +1626,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1627,7 +1627,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
//MinecraftTimings.tickablesTimer.stopTiming(); // Spigot // Paper // Purpur
@ -232,7 +232,7 @@ index 3ac653f12287fd8ad8966017d3faab2541cfd3b6..3d30dbb66d05f76545e119243cba4d54
}
public boolean isNetherEnabled() {
@@ -2274,7 +2274,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2275,7 +2275,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public ProfilerFiller getProfiler() {
@ -241,7 +241,7 @@ index 3ac653f12287fd8ad8966017d3faab2541cfd3b6..3d30dbb66d05f76545e119243cba4d54
return this.profiler;
}
@@ -2514,7 +2514,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2515,7 +2515,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
// CraftBukkit end
private void startMetricsRecordingTick() {
@ -250,7 +250,7 @@ index 3ac653f12287fd8ad8966017d3faab2541cfd3b6..3d30dbb66d05f76545e119243cba4d54
this.metricsRecorder = ActiveMetricsRecorder.createStarted(new ServerMetricsSamplersProvider(Util.timeSource, this.isDedicatedServer()), Util.timeSource, Util.ioPool(), new MetricsPersister("server"), this.onMetricsRecordingStopped, (path) -> {
this.executeBlocking(() -> {
this.saveDebugReport(path.resolve("server"));
@@ -2524,40 +2524,40 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2525,40 +2525,40 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.willStartRecordingMetrics = false;
}
@ -303,7 +303,7 @@ index 3ac653f12287fd8ad8966017d3faab2541cfd3b6..3d30dbb66d05f76545e119243cba4d54
}
public Path getWorldPath(LevelResource worldSavePath) {
@@ -2602,15 +2602,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2603,15 +2603,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public boolean isTimeProfilerRunning() {