Skip to content

Commit 6aec125

Browse files
grannygranny
committed
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@e7e1c8a Fix and add new scoreboard API (#10037) PaperMC/Paper@49f9f6f Add Registry#getKey (#10066) PaperMC/Paper@4adca3d Update to adventure 4.15 (#10045) PaperMC/Paper@ff7b9b0 Increase default custom payload channel size limit (#10006)
1 parent c80f192 commit 6aec125

13 files changed

Lines changed: 39 additions & 39 deletions

‎gradle.properties‎

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

44
mcVersion = 1.20.4
5-
paperCommit = 1e7dd72f15a1d13b43792367193547c656a16ab6
5+
paperCommit = ff7b9b03805ae54af82135d66dea75b4e6761343
66

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

‎patches/api/0003-Purpur-client-support.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur client support
55

66

77
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
8-
index ec937534f049ba25fb359c3e022ebe52ead6abef..a9eca07e4fe39221d3a675482b371a2da74a79d4 100644
8+
index c09f423fe2a029c933bd2697c8ff104fc4230cf0..0246fdcb873c50cf15581899b951ecb23b51d226 100644
99
--- a/src/main/java/org/bukkit/entity/Player.java
1010
+++ b/src/main/java/org/bukkit/entity/Player.java
11-
@@ -3507,4 +3507,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
11+
@@ -3535,4 +3535,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
1212
@Override
1313
Spigot spigot();
1414
// Spigot end

‎patches/api/0008-AFK-API.patch‎

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

66

77
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
8-
index a9eca07e4fe39221d3a675482b371a2da74a79d4..7ae6de0bdf01a3c94aa0287354ddfe4c838ff658 100644
8+
index 0246fdcb873c50cf15581899b951ecb23b51d226..8749e76035350908bbf2d8debd28ea5a2eb2d7ac 100644
99
--- a/src/main/java/org/bukkit/entity/Player.java
1010
+++ b/src/main/java/org/bukkit/entity/Player.java
11-
@@ -3515,5 +3515,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
11+
@@ -3543,5 +3543,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
1212
* @return True if Player uses Purpur Client
1313
*/
1414
public boolean usesPurpurClient();

‎patches/api/0042-Debug-Marker-API.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,10 +260,10 @@ index 26fe07a4429e40da1ce4a0433ae184f594ddb473..405d60bd2c99ba741d2614b16f4bda5d
260260

261261
/**
262262
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
263-
index 7ae6de0bdf01a3c94aa0287354ddfe4c838ff658..36a1952513dcc146c75856a6a5abc61acd1a3e0a 100644
263+
index 8749e76035350908bbf2d8debd28ea5a2eb2d7ac..ac9f3b74a2c0d2fadb52cc3f3e11d635f9088cf8 100644
264264
--- a/src/main/java/org/bukkit/entity/Player.java
265265
+++ b/src/main/java/org/bukkit/entity/Player.java
266-
@@ -3535,5 +3535,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
266+
@@ -3563,5 +3563,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
267267
* @deprecated Use {@link #resetIdleDuration()} instead
268268
*/
269269
void resetIdleTimer();

‎patches/api/0043-Add-death-screen-API.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Add death screen API
55

66

77
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
8-
index 36a1952513dcc146c75856a6a5abc61acd1a3e0a..117e7eda393832cede8fd6443c9fdc794b59d17f 100644
8+
index ac9f3b74a2c0d2fadb52cc3f3e11d635f9088cf8..ee76f84c8e341e4939ed0082a6ed889b701533cb 100644
99
--- a/src/main/java/org/bukkit/entity/Player.java
1010
+++ b/src/main/java/org/bukkit/entity/Player.java
11-
@@ -3605,5 +3605,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
11+
@@ -3633,5 +3633,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
1212
* Clears all debug block highlights
1313
*/
1414
void clearBlockHighlights();

‎patches/server/0001-Rebrand.patch‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ Subject: [PATCH] Rebrand
55

66

77
diff --git a/build.gradle.kts b/build.gradle.kts
8-
index b12b5a1e82a5ebf47135a3863a390a45a9d8d8ec..d7951a9b3819ddc1d42e10d40bdf57ae47666d89 100644
8+
index 58da26ad2f128ba0b66f86820f60853f4be352f0..12f4b3d753b56947e3759888ba3d98fa693c2a3f 100644
99
--- a/build.gradle.kts
1010
+++ b/build.gradle.kts
11-
@@ -27,8 +27,12 @@ repositories {
11+
@@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
12+
val alsoShade: Configuration by configurations.creating
1213

1314
dependencies {
14-
extraRuntime(platform("net.kyori:adventure-bom:4.15.0-SNAPSHOT"))
1515
- implementation(project(":paper-api"))
1616
- implementation(project(":paper-mojangapi"))
1717
+ // Purpur start
@@ -23,7 +23,7 @@ index b12b5a1e82a5ebf47135a3863a390a45a9d8d8ec..d7951a9b3819ddc1d42e10d40bdf57ae
2323
// Paper start
2424
implementation("org.jline:jline-terminal-jansi:3.21.0")
2525
implementation("net.minecrell:terminalconsoleappender:1.3.0")
26-
@@ -65,6 +69,10 @@ dependencies {
26+
@@ -51,6 +55,10 @@ dependencies {
2727
runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
2828
runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
2929

@@ -34,7 +34,7 @@ index b12b5a1e82a5ebf47135a3863a390a45a9d8d8ec..d7951a9b3819ddc1d42e10d40bdf57ae
3434
testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
3535
testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
3636
testImplementation("org.hamcrest:hamcrest:2.2")
37-
@@ -84,7 +92,7 @@ tasks.jar {
37+
@@ -70,7 +78,7 @@ tasks.jar {
3838
attributes(
3939
"Main-Class" to "org.bukkit.craftbukkit.Main",
4040
"Implementation-Title" to "CraftBukkit",
@@ -43,7 +43,7 @@ index b12b5a1e82a5ebf47135a3863a390a45a9d8d8ec..d7951a9b3819ddc1d42e10d40bdf57ae
4343
"Implementation-Vendor" to date, // Paper
4444
"Specification-Title" to "Bukkit",
4545
"Specification-Version" to project.version,
46-
@@ -168,7 +176,7 @@ fun TaskContainer.registerRunTask(
46+
@@ -154,7 +162,7 @@ fun TaskContainer.registerRunTask(
4747
name: String,
4848
block: JavaExec.() -> Unit
4949
): TaskProvider<JavaExec> = register<JavaExec>(name) {

‎patches/server/0003-Purpur-client-support.patch‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Purpur client support
55

66

77
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
8-
index 8efbbd379244e3ed54d4aba199037cc20ccd096a..86cf69de7a35f1ac8e2c56f988e74832332470d2 100644
8+
index d1f20a8a3ccea1f074624163eb96da023142a459..f45cd36ddc96d19f11bde4db1094d92ae4b13786 100644
99
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
1010
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
1111
@@ -281,6 +281,7 @@ public class ServerPlayer extends Player {
@@ -17,18 +17,18 @@ index 8efbbd379244e3ed54d4aba199037cc20ccd096a..86cf69de7a35f1ac8e2c56f988e74832
1717
// Paper start - replace player chunk loader
1818
private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
1919
diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
20-
index 4a712f5fc4f0b4a4434ae808c989113bee8d8634..fb03498b355a86e156ed26ee903ba93c03365dcb 100644
20+
index d28d0ef6105ddeb562ddf31ae9088739856941fc..49aaa5147b9b904fa912c1811dc66d47d2e8dada 100644
2121
--- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
2222
+++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
23-
@@ -55,6 +55,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
24-
private volatile boolean suspendFlushingOnServerThread = false;
23+
@@ -56,6 +56,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
24+
public final java.util.Map<java.util.UUID, net.kyori.adventure.resource.ResourcePackCallback> packCallbacks = new java.util.concurrent.ConcurrentHashMap<>(); // Paper - adventure resource pack callbacks
2525
private static final long KEEPALIVE_LIMIT = Long.getLong("paper.playerconnection.keepalive", 30) * 1000; // Paper - provide property to set keepalive limit
2626
protected static final ResourceLocation MINECRAFT_BRAND = new ResourceLocation("brand"); // Paper - Brand support
2727
+ protected static final ResourceLocation PURPUR_CLIENT = new ResourceLocation("purpur", "client"); // Purpur
2828

2929
public ServerCommonPacketListenerImpl(MinecraftServer minecraftserver, Connection networkmanager, CommonListenerCookie commonlistenercookie, ServerPlayer player) { // CraftBukkit
3030
this.server = minecraftserver;
31-
@@ -137,6 +138,13 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
31+
@@ -138,6 +139,13 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
3232
ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t register custom payload", ex);
3333
this.disconnect("Invalid payload REGISTER!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause
3434
}
@@ -43,10 +43,10 @@ index 4a712f5fc4f0b4a4434ae808c989113bee8d8634..fb03498b355a86e156ed26ee903ba93c
4343
try {
4444
String channels = payload.toString(com.google.common.base.Charsets.UTF_8);
4545
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
46-
index 3be5e4df190bff0087c8450b16e4e37b07169040..bb18dc57689c1002ae2ee418f88d2b799beb6fc8 100644
46+
index fa5024752652b6daf53dbb9e23a9e86fea203fe2..729cdd9cf47fe8c46df9270202cc6a0d78b61052 100644
4747
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
4848
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
49-
@@ -3303,4 +3303,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
49+
@@ -3327,4 +3327,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
5050
return this.spigot;
5151
}
5252
// Spigot end

‎patches/server/0010-AFK-API.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] AFK API
55

66

77
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
8-
index d5940e560ea890f7f017ff9c37939a485be94540..f862bd65b535fc9e289b31260af6990773336a5a 100644
8+
index 40044a75ea071829daa5e531add542d2d24b7988..f9db41f311ad564380587bb2a0b69129e93ef87c 100644
99
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
1010
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
1111
@@ -2233,8 +2233,68 @@ public class ServerPlayer extends Player {
@@ -223,7 +223,7 @@ index aaa07fcd4b32fe0de88142ab30378327a01f1729..bc8555d21d418f9da37cc089904f7cb0
223223
if (range < 0.0D || d < range * range) {
224224
return true;
225225
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
226-
index bb18dc57689c1002ae2ee418f88d2b799beb6fc8..72bd74a2fd6c9f7aec79ee7e4003cecbb4a3f95a 100644
226+
index 729cdd9cf47fe8c46df9270202cc6a0d78b61052..6d584e67ac7aac67a93fb369cb3b9f31cd198cb2 100644
227227
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
228228
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
229229
@@ -524,10 +524,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -243,7 +243,7 @@ index bb18dc57689c1002ae2ee418f88d2b799beb6fc8..72bd74a2fd6c9f7aec79ee7e4003cecb
243243
for (ServerPlayer player : (List<ServerPlayer>) this.server.getHandle().players) {
244244
if (player.getBukkitEntity().canSee(this)) {
245245
player.connection.send(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME, this.getHandle()));
246-
@@ -3309,5 +3314,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
246+
@@ -3333,5 +3338,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
247247
public boolean usesPurpurClient() {
248248
return getHandle().purpurClient;
249249
}

‎patches/server/0017-Alternative-Keepalive-Handling.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Alternative Keepalive Handling
55

66

77
diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
8-
index 13e064451c4d48e873061b6dea431a6b101de2ee..04b9f56134a24385468c16c61cf84327263dcb88 100644
8+
index 49aaa5147b9b904fa912c1811dc66d47d2e8dada..97914d9c0d8f9ad58fbc79db2afd9cba57bf93b6 100644
99
--- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
1010
+++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
1111
@@ -51,6 +51,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
@@ -15,8 +15,8 @@ index 13e064451c4d48e873061b6dea431a6b101de2ee..04b9f56134a24385468c16c61cf84327
1515
+ private it.unimi.dsi.fastutil.longs.LongList keepAlives = new it.unimi.dsi.fastutil.longs.LongArrayList(); // Purpur
1616
private int latency;
1717
private volatile boolean suspendFlushingOnServerThread = false;
18-
private static final long KEEPALIVE_LIMIT = Long.getLong("paper.playerconnection.keepalive", 30) * 1000; // Paper - provide property to set keepalive limit
19-
@@ -91,6 +92,16 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
18+
public final java.util.Map<java.util.UUID, net.kyori.adventure.resource.ResourcePackCallback> packCallbacks = new java.util.concurrent.ConcurrentHashMap<>(); // Paper - adventure resource pack callbacks
19+
@@ -92,6 +93,16 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
2020

2121
@Override
2222
public void handleKeepAlive(ServerboundKeepAlivePacket packet) {
@@ -33,7 +33,7 @@ index 13e064451c4d48e873061b6dea431a6b101de2ee..04b9f56134a24385468c16c61cf84327
3333
//PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); // CraftBukkit // Paper - This shouldn't be on the main thread
3434
if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
3535
int i = (int) (Util.getMillis() - this.keepAliveTime);
36-
@@ -204,6 +215,21 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
36+
@@ -217,6 +228,21 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
3737
long currentTime = Util.getMillis();
3838
long elapsedTime = currentTime - this.keepAliveTime;
3939

@@ -56,7 +56,7 @@ index 13e064451c4d48e873061b6dea431a6b101de2ee..04b9f56134a24385468c16c61cf84327
5656
if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
5757
ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info
5858
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
59-
index 34afed28faeb56352b48faf8078a5fb07912eb5e..ad239ba9259c5a63b40261ebc44224893496b47d 100644
59+
index 9c5bba0ae119f8d42274455e322530ceb5f67d9b..a14cf3a5dc2ba265de5e400404afcbd9faa3f25a 100644
6060
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
6161
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
6262
@@ -198,6 +198,11 @@ public class PurpurConfig {

‎patches/server/0206-Extended-OfflinePlayer-API.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,10 +223,10 @@ index 2bbc39c257965ad91ee360cdfcd3538a0f041c7e..91fbc0cfc84045e32a4ee16fba8164de
223223
+ // Purpur end - OfflinePlayer API
224224
}
225225
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
226-
index a7a702ccb7cab7d68758078927544f2928a5ea62..791f030b4912b46ef70f3099eb3537515464c54b 100644
226+
index 0b20bb986ee71a57a1c01c85ea7ab1292c9bcc52..df3953b541fc85985ded4a89e03bf5d840f7ed6d 100644
227227
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
228228
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
229-
@@ -2575,6 +2575,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
229+
@@ -2599,6 +2599,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
230230
return this.getHandle().getAbilities().walkingSpeed * 2f;
231231
}
232232

0 commit comments

Comments
 (0)