Skip to content

Commit 3e8b148

Browse files
BillyGalbreathBillyGalbreath
committed
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@196271d Fix save problems on shutdown PaperMC/Paper@1e12cf8 Add more to the save fixes
1 parent 498f646 commit 3e8b148

12 files changed

Lines changed: 29 additions & 29 deletions

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
group = org.purpurmc.purpur
22
version = 1.18.2-R0.1-SNAPSHOT
33

4-
paperCommit = 6564f70f4c569e46f3320c284b4fead197fccd05
4+
paperCommit = 1e12cf8db62dde92a4bc79300ef32e0fdc6e50a8
55

66
org.gradle.caching = true
77
org.gradle.parallel = true

‎patches/server/0001-Pufferfish-Server-Changes.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2149,7 +2149,7 @@ index 7bddc7517356cc74104dcc5c7c55522a53f2596f..d6a57cdad2c92521a800cb18d060d9d6
21492149

21502150
public static long getCoordinateKey(final ChunkPos pair) {
21512151
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
2152-
index 07c382f30ed3736ed15b5b71f48dc4a1de958242..a6d8f128ac1c2eacf662ee40a04275d45d6754ca 100644
2152+
index 39b7c78b032ed6fc29ac765020d5a38858bf2a3a..f66a255d88ea582b2c831a577dee445b486cc37d 100644
21532153
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
21542154
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
21552155
@@ -311,6 +311,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2161,7 +2161,7 @@ index 07c382f30ed3736ed15b5b71f48dc4a1de958242..a6d8f128ac1c2eacf662ee40a04275d4
21612161
public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
21622162
AtomicReference<S> atomicreference = new AtomicReference();
21632163
Thread thread = new Thread(() -> {
2164-
@@ -1683,7 +1685,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2164+
@@ -1697,7 +1699,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
21652165

21662166
@DontObfuscate
21672167
public String getServerModName() {
@@ -2170,7 +2170,7 @@ index 07c382f30ed3736ed15b5b71f48dc4a1de958242..a6d8f128ac1c2eacf662ee40a04275d4
21702170
}
21712171

21722172
public SystemReport fillSystemReport(SystemReport details) {
2173-
@@ -2242,6 +2244,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2173+
@@ -2256,6 +2258,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
21742174
}
21752175

21762176
public ProfilerFiller getProfiler() {
@@ -2368,7 +2368,7 @@ index 1092ba200a945d8d70e48f956535f56e2743302d..937a93d134dc986fe23e5676d58f7619
23682368
this.wasOnGround = this.entity.isOnGround();
23692369
this.teleportDelay = 0;
23702370
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
2371-
index b5b56d4549e97abbbe9e91d881b9bca8428f1eec..5e9ad7c828a196e6fe85bb3e32aa23b95c83b39d 100644
2371+
index dce7452d58d6081f1a83baddafb1596ebd423d21..48e428ce0590c530522de56c9f9c8cf1631c6e01 100644
23722372
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
23732373
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
23742374
@@ -670,7 +670,20 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -3172,7 +3172,7 @@ index b770e7840b00b46a127ae05cc872a21f7a2dffad..772200b9efe232cb407e460f2353a156
31723172
return false;
31733173
}
31743174
diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
3175-
index 15744949537430d8d8ae71ea72481126c9aff7bd..4759a6b3d3cd7973744562adf97d110d359ebce3 100644
3175+
index ccaa97956e40c6a79371d813719f65687991ec5b..0c7d31c7ffd603e54fb19010331ad220c7b15627 100644
31763176
--- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
31773177
+++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
31783178
@@ -42,6 +42,36 @@ public abstract class Projectile extends Entity {

‎patches/server/0002-Rebrand.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ index 1a859fef0848cf23a672012e9764965ae1c07ec5..14ed740609b14242c2a8d377a78b2f71
167167
stringbuilder.append(CrashReport.getErrorComment());
168168
stringbuilder.append("\n\n");
169169
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
170-
index a6d8f128ac1c2eacf662ee40a04275d45d6754ca..4633f75991dc5e261fb96bd707cca7bf304fcc13 100644
170+
index f66a255d88ea582b2c831a577dee445b486cc37d..532a658a37a49c05734903449878ddbea7ed980f 100644
171171
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
172172
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
173173
@@ -958,7 +958,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -179,7 +179,7 @@ index a6d8f128ac1c2eacf662ee40a04275d45d6754ca..4633f75991dc5e261fb96bd707cca7bf
179179
while (this.getRunningThread().isAlive()) {
180180
this.getRunningThread().stop();
181181
try {
182-
@@ -1685,7 +1685,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
182+
@@ -1699,7 +1699,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
183183

184184
@DontObfuscate
185185
public String getServerModName() {

‎patches/server/0006-Ridables.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ index 8c79f66abd42e9c9875e8877c6dd82b5e3cfa184..2841469748bc308f690aaeb34fe05cb2
2222
super(x, y, z);
2323
}
2424
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
25-
index 4633f75991dc5e261fb96bd707cca7bf304fcc13..40ec9dc096f292707bfe93dde0bc727dbff4de88 100644
25+
index 532a658a37a49c05734903449878ddbea7ed980f..dde15e73d1967d99bc626ba2e5d2e1d4194378e7 100644
2626
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
2727
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
28-
@@ -1563,6 +1563,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
28+
@@ -1577,6 +1577,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2929
ServerLevel worldserver = (ServerLevel) iterator.next();
3030
worldserver.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
3131
worldserver.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
@@ -34,7 +34,7 @@ index 4633f75991dc5e261fb96bd707cca7bf304fcc13..40ec9dc096f292707bfe93dde0bc727d
3434

3535
this.profiler.push(() -> {
3636
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
37-
index 5e9ad7c828a196e6fe85bb3e32aa23b95c83b39d..25d66a6d717c21602318e23f417658c2aeebeb18 100644
37+
index 48e428ce0590c530522de56c9f9c8cf1631c6e01..e0bf9bd1088dd4d126a62bf96a0e9c37d2dc7116 100644
3838
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
3939
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
4040
@@ -212,6 +212,7 @@ public class ServerLevel extends Level implements WorldGenLevel {

‎patches/server/0013-Configurable-server-mod-name.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable server mod name
55

66

77
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
8-
index 40ec9dc096f292707bfe93dde0bc727dbff4de88..3290702916f6ee8dca3d5a79ddad90b1db3d76a0 100644
8+
index dde15e73d1967d99bc626ba2e5d2e1d4194378e7..c9e6334ad389aea328ffbc7ec1cc460b28f47995 100644
99
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
1010
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
11-
@@ -1686,7 +1686,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
11+
@@ -1700,7 +1700,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
1212

1313
@DontObfuscate
1414
public String getServerModName() {

‎patches/server/0015-Lagging-threshold.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Lagging threshold
55

66

77
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
8-
index 3290702916f6ee8dca3d5a79ddad90b1db3d76a0..b9b95ccd4a1041008b54d6cd0293ea220bdcac8d 100644
8+
index c9e6334ad389aea328ffbc7ec1cc460b28f47995..0511e63ed1af2348f6fb4d7c7cede247bb212b06 100644
99
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
1010
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
1111
@@ -304,6 +304,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -16,7 +16,7 @@ index 3290702916f6ee8dca3d5a79ddad90b1db3d76a0..b9b95ccd4a1041008b54d6cd0293ea22
1616
public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
1717
// Spigot end
1818
public static long currentTickLong = 0L; // Paper
19-
@@ -1203,6 +1204,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
19+
@@ -1212,6 +1213,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2020
this.recentTps[1] = tps5.getAverage();
2121
this.recentTps[2] = tps15.getAverage();
2222
// Paper end

‎patches/server/0052-Configurable-TPS-Catchup.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable TPS Catchup
55

66

77
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
8-
index b9b95ccd4a1041008b54d6cd0293ea220bdcac8d..4956c82877a9b2b89ef626260e3abf1523f7d7fe 100644
8+
index 0511e63ed1af2348f6fb4d7c7cede247bb212b06..4d7fe9b259fb765944d675cce20dffdfb13acd63 100644
99
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
1010
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
11-
@@ -1222,7 +1222,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
11+
@@ -1231,7 +1231,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
1212
this.tickServer(this::haveTime);
1313
this.profiler.popPush("nextTickWait");
1414
this.mayHaveDelayedTasks = true;

‎patches/server/0066-Add-5-second-tps-average-in-tps.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ index fa56cd09102a89692b42f1d14257990508c5c720..f9251183df72ddc56662fd3f02acf216
2727
setListData(vector);
2828
}
2929
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
30-
index 4956c82877a9b2b89ef626260e3abf1523f7d7fe..4f227401e17419f0ed4344b38aeb7f86d99ba3b5 100644
30+
index 4d7fe9b259fb765944d675cce20dffdfb13acd63..81b8b8b597f6b33e011d708fe8e70b7a5865d94c 100644
3131
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
3232
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
3333
@@ -303,7 +303,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -39,15 +39,15 @@ index 4956c82877a9b2b89ef626260e3abf1523f7d7fe..4f227401e17419f0ed4344b38aeb7f86
3939
public boolean lagging = false; // Purpur
4040
public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
4141
// Spigot end
42-
@@ -1106,6 +1106,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
42+
@@ -1115,6 +1115,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
4343
private static final long MAX_CATCHUP_BUFFER = TICK_TIME * TPS * 60L;
4444
private long lastTick = 0;
4545
private long catchupTime = 0;
4646
+ public final RollingAverage tps5s = new RollingAverage(5); // Purpur
4747
public final RollingAverage tps1 = new RollingAverage(60);
4848
public final RollingAverage tps5 = new RollingAverage(60 * 5);
4949
public final RollingAverage tps15 = new RollingAverage(60 * 15);
50-
@@ -1196,13 +1197,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
50+
@@ -1205,13 +1206,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
5151
{
5252
final long diff = curTime - tickSection;
5353
java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);

‎patches/server/0105-Configurable-daylight-cycle.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ index 689ad22925b2561f7c8db961743eb1f821dbb25f..fa3c960992cc240161817e54659d83fe
1818
public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) {
1919
this.gameTime = time % 192000; // Paper - fix guardian beam
2020
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
21-
index 4f227401e17419f0ed4344b38aeb7f86d99ba3b5..53b27a29e44d5e6afb78871fd36ca573237e6d8b 100644
21+
index 81b8b8b597f6b33e011d708fe8e70b7a5865d94c..219eb6598cb55612fe6e31aa0c367d7eecb92a5a 100644
2222
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
2323
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
24-
@@ -1559,7 +1559,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
24+
@@ -1573,7 +1573,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2525
long worldTime = world.getGameTime();
2626
final ClientboundSetTimePacket worldPacket = new ClientboundSetTimePacket(worldTime, dayTime, doDaylight);
2727
for (Player entityhuman : world.players()) {
@@ -31,7 +31,7 @@ index 4f227401e17419f0ed4344b38aeb7f86d99ba3b5..53b27a29e44d5e6afb78871fd36ca573
3131
}
3232
ServerPlayer entityplayer = (ServerPlayer) entityhuman;
3333
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
34-
index 770284a45385e64ad08b918f54e52777c98b8fd1..33e5d641781a5aaeb401167d67518f524380a6a6 100644
34+
index db425800cf0ab616209c49c200bf00a8d86b8a7f..9893ea832c5763c5e72f81573e4c40c700d50358 100644
3535
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
3636
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
3737
@@ -202,6 +202,8 @@ public class ServerLevel extends Level implements WorldGenLevel {

‎patches/server/0127-Implement-TPSBar.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ index 362fd34016b83ba346a43abb6acf38d887918437..c137f5299e4a9e2f33aeef77818c62c3
1717

1818
if (environment.includeIntegrated) {
1919
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
20-
index 53b27a29e44d5e6afb78871fd36ca573237e6d8b..2b344ddae29a578664888df853b5c48c728c4d50 100644
20+
index 219eb6598cb55612fe6e31aa0c367d7eecb92a5a..1b80586e951e1907daacf5d8ffca6da6d713d3eb 100644
2121
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
2222
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
23-
@@ -1080,6 +1080,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
23+
@@ -1089,6 +1089,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2424
this.safeShutdown(flag, false);
2525
}
2626
public void safeShutdown(boolean flag, boolean isRestarting) {

0 commit comments

Comments
 (0)