From 6aec125590f0c6a88858f1541244e95e82bce4cb Mon Sep 17 00:00:00 2001 From: granny Date: Mon, 25 Dec 2023 05:45:38 -0800 Subject: [PATCH] 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) --- gradle.properties | 2 +- patches/api/0003-Purpur-client-support.patch | 4 ++-- patches/api/0008-AFK-API.patch | 4 ++-- patches/api/0042-Debug-Marker-API.patch | 4 ++-- patches/api/0043-Add-death-screen-API.patch | 4 ++-- patches/server/0001-Rebrand.patch | 12 ++++++------ patches/server/0003-Purpur-client-support.patch | 14 +++++++------- patches/server/0010-AFK-API.patch | 6 +++--- .../0017-Alternative-Keepalive-Handling.patch | 10 +++++----- .../server/0206-Extended-OfflinePlayer-API.patch | 4 ++-- patches/server/0264-Remove-Mojang-Profiler.patch | 6 +++--- patches/server/0267-Debug-Marker-API.patch | 4 ++-- patches/server/0271-Add-death-screen-API.patch | 4 ++-- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/gradle.properties b/gradle.properties index a641acaf8..af4e83284 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.purpurmc.purpur version = 1.20.4-R0.1-SNAPSHOT mcVersion = 1.20.4 -paperCommit = 1e7dd72f15a1d13b43792367193547c656a16ab6 +paperCommit = ff7b9b03805ae54af82135d66dea75b4e6761343 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/api/0003-Purpur-client-support.patch b/patches/api/0003-Purpur-client-support.patch index f03656601..aea0fd5cd 100644 --- a/patches/api/0003-Purpur-client-support.patch +++ b/patches/api/0003-Purpur-client-support.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Purpur client support diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index ec937534f049ba25fb359c3e022ebe52ead6abef..a9eca07e4fe39221d3a675482b371a2da74a79d4 100644 +index c09f423fe2a029c933bd2697c8ff104fc4230cf0..0246fdcb873c50cf15581899b951ecb23b51d226 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3507,4 +3507,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3535,4 +3535,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @Override Spigot spigot(); // Spigot end diff --git a/patches/api/0008-AFK-API.patch b/patches/api/0008-AFK-API.patch index 254d20dd3..800f35d1a 100644 --- a/patches/api/0008-AFK-API.patch +++ b/patches/api/0008-AFK-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] AFK API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index a9eca07e4fe39221d3a675482b371a2da74a79d4..7ae6de0bdf01a3c94aa0287354ddfe4c838ff658 100644 +index 0246fdcb873c50cf15581899b951ecb23b51d226..8749e76035350908bbf2d8debd28ea5a2eb2d7ac 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3515,5 +3515,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3543,5 +3543,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @return True if Player uses Purpur Client */ public boolean usesPurpurClient(); diff --git a/patches/api/0042-Debug-Marker-API.patch b/patches/api/0042-Debug-Marker-API.patch index 9330c5dd0..26fc43f14 100644 --- a/patches/api/0042-Debug-Marker-API.patch +++ b/patches/api/0042-Debug-Marker-API.patch @@ -260,10 +260,10 @@ index 26fe07a4429e40da1ce4a0433ae184f594ddb473..405d60bd2c99ba741d2614b16f4bda5d /** diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 7ae6de0bdf01a3c94aa0287354ddfe4c838ff658..36a1952513dcc146c75856a6a5abc61acd1a3e0a 100644 +index 8749e76035350908bbf2d8debd28ea5a2eb2d7ac..ac9f3b74a2c0d2fadb52cc3f3e11d635f9088cf8 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3535,5 +3535,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3563,5 +3563,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @deprecated Use {@link #resetIdleDuration()} instead */ void resetIdleTimer(); diff --git a/patches/api/0043-Add-death-screen-API.patch b/patches/api/0043-Add-death-screen-API.patch index d52845721..fa384e401 100644 --- a/patches/api/0043-Add-death-screen-API.patch +++ b/patches/api/0043-Add-death-screen-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add death screen API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 36a1952513dcc146c75856a6a5abc61acd1a3e0a..117e7eda393832cede8fd6443c9fdc794b59d17f 100644 +index ac9f3b74a2c0d2fadb52cc3f3e11d635f9088cf8..ee76f84c8e341e4939ed0082a6ed889b701533cb 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3605,5 +3605,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3633,5 +3633,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * Clears all debug block highlights */ void clearBlockHighlights(); diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch index 0c6dd80c4..09d900872 100644 --- a/patches/server/0001-Rebrand.patch +++ b/patches/server/0001-Rebrand.patch @@ -5,13 +5,13 @@ Subject: [PATCH] Rebrand diff --git a/build.gradle.kts b/build.gradle.kts -index b12b5a1e82a5ebf47135a3863a390a45a9d8d8ec..d7951a9b3819ddc1d42e10d40bdf57ae47666d89 100644 +index 58da26ad2f128ba0b66f86820f60853f4be352f0..12f4b3d753b56947e3759888ba3d98fa693c2a3f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -27,8 +27,12 @@ repositories { +@@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { + val alsoShade: Configuration by configurations.creating dependencies { - extraRuntime(platform("net.kyori:adventure-bom:4.15.0-SNAPSHOT")) - implementation(project(":paper-api")) - implementation(project(":paper-mojangapi")) + // Purpur start @@ -23,7 +23,7 @@ index b12b5a1e82a5ebf47135a3863a390a45a9d8d8ec..d7951a9b3819ddc1d42e10d40bdf57ae // Paper start implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("net.minecrell:terminalconsoleappender:1.3.0") -@@ -65,6 +69,10 @@ dependencies { +@@ -51,6 +55,10 @@ dependencies { runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18") runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18") @@ -34,7 +34,7 @@ index b12b5a1e82a5ebf47135a3863a390a45a9d8d8ec..d7951a9b3819ddc1d42e10d40bdf57ae testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test testImplementation("org.junit.jupiter:junit-jupiter:5.10.0") testImplementation("org.hamcrest:hamcrest:2.2") -@@ -84,7 +92,7 @@ tasks.jar { +@@ -70,7 +78,7 @@ tasks.jar { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", @@ -43,7 +43,7 @@ index b12b5a1e82a5ebf47135a3863a390a45a9d8d8ec..d7951a9b3819ddc1d42e10d40bdf57ae "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -168,7 +176,7 @@ fun TaskContainer.registerRunTask( +@@ -154,7 +162,7 @@ fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { diff --git a/patches/server/0003-Purpur-client-support.patch b/patches/server/0003-Purpur-client-support.patch index 64d5ed296..dc5ae85cf 100644 --- a/patches/server/0003-Purpur-client-support.patch +++ b/patches/server/0003-Purpur-client-support.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Purpur client support diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 8efbbd379244e3ed54d4aba199037cc20ccd096a..86cf69de7a35f1ac8e2c56f988e74832332470d2 100644 +index d1f20a8a3ccea1f074624163eb96da023142a459..f45cd36ddc96d19f11bde4db1094d92ae4b13786 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -281,6 +281,7 @@ public class ServerPlayer extends Player { @@ -17,18 +17,18 @@ index 8efbbd379244e3ed54d4aba199037cc20ccd096a..86cf69de7a35f1ac8e2c56f988e74832 // Paper start - replace player chunk loader private final java.util.concurrent.atomic.AtomicReference viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1)); diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -index 4a712f5fc4f0b4a4434ae808c989113bee8d8634..fb03498b355a86e156ed26ee903ba93c03365dcb 100644 +index d28d0ef6105ddeb562ddf31ae9088739856941fc..49aaa5147b9b904fa912c1811dc66d47d2e8dada 100644 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -@@ -55,6 +55,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack - private volatile boolean suspendFlushingOnServerThread = false; +@@ -56,6 +56,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack + public final java.util.Map packCallbacks = new java.util.concurrent.ConcurrentHashMap<>(); // Paper - adventure resource pack callbacks private static final long KEEPALIVE_LIMIT = Long.getLong("paper.playerconnection.keepalive", 30) * 1000; // Paper - provide property to set keepalive limit protected static final ResourceLocation MINECRAFT_BRAND = new ResourceLocation("brand"); // Paper - Brand support + protected static final ResourceLocation PURPUR_CLIENT = new ResourceLocation("purpur", "client"); // Purpur public ServerCommonPacketListenerImpl(MinecraftServer minecraftserver, Connection networkmanager, CommonListenerCookie commonlistenercookie, ServerPlayer player) { // CraftBukkit this.server = minecraftserver; -@@ -137,6 +138,13 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack +@@ -138,6 +139,13 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t register custom payload", ex); this.disconnect("Invalid payload REGISTER!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause } @@ -43,10 +43,10 @@ index 4a712f5fc4f0b4a4434ae808c989113bee8d8634..fb03498b355a86e156ed26ee903ba93c try { String channels = payload.toString(com.google.common.base.Charsets.UTF_8); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 3be5e4df190bff0087c8450b16e4e37b07169040..bb18dc57689c1002ae2ee418f88d2b799beb6fc8 100644 +index fa5024752652b6daf53dbb9e23a9e86fea203fe2..729cdd9cf47fe8c46df9270202cc6a0d78b61052 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -3303,4 +3303,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3327,4 +3327,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return this.spigot; } // Spigot end diff --git a/patches/server/0010-AFK-API.patch b/patches/server/0010-AFK-API.patch index 0f7b7ffd8..ac3c7aa08 100644 --- a/patches/server/0010-AFK-API.patch +++ b/patches/server/0010-AFK-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] AFK API diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index d5940e560ea890f7f017ff9c37939a485be94540..f862bd65b535fc9e289b31260af6990773336a5a 100644 +index 40044a75ea071829daa5e531add542d2d24b7988..f9db41f311ad564380587bb2a0b69129e93ef87c 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2233,8 +2233,68 @@ public class ServerPlayer extends Player { @@ -223,7 +223,7 @@ index aaa07fcd4b32fe0de88142ab30378327a01f1729..bc8555d21d418f9da37cc089904f7cb0 if (range < 0.0D || d < range * range) { return true; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index bb18dc57689c1002ae2ee418f88d2b799beb6fc8..72bd74a2fd6c9f7aec79ee7e4003cecbb4a3f95a 100644 +index 729cdd9cf47fe8c46df9270202cc6a0d78b61052..6d584e67ac7aac67a93fb369cb3b9f31cd198cb2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -524,10 +524,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -243,7 +243,7 @@ index bb18dc57689c1002ae2ee418f88d2b799beb6fc8..72bd74a2fd6c9f7aec79ee7e4003cecb for (ServerPlayer player : (List) this.server.getHandle().players) { if (player.getBukkitEntity().canSee(this)) { player.connection.send(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME, this.getHandle())); -@@ -3309,5 +3314,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3333,5 +3338,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public boolean usesPurpurClient() { return getHandle().purpurClient; } diff --git a/patches/server/0017-Alternative-Keepalive-Handling.patch b/patches/server/0017-Alternative-Keepalive-Handling.patch index 5b9f3072c..cd9f3544e 100644 --- a/patches/server/0017-Alternative-Keepalive-Handling.patch +++ b/patches/server/0017-Alternative-Keepalive-Handling.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Alternative Keepalive Handling diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -index 13e064451c4d48e873061b6dea431a6b101de2ee..04b9f56134a24385468c16c61cf84327263dcb88 100644 +index 49aaa5147b9b904fa912c1811dc66d47d2e8dada..97914d9c0d8f9ad58fbc79db2afd9cba57bf93b6 100644 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java @@ -51,6 +51,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack @@ -15,8 +15,8 @@ index 13e064451c4d48e873061b6dea431a6b101de2ee..04b9f56134a24385468c16c61cf84327 + private it.unimi.dsi.fastutil.longs.LongList keepAlives = new it.unimi.dsi.fastutil.longs.LongArrayList(); // Purpur private int latency; private volatile boolean suspendFlushingOnServerThread = false; - private static final long KEEPALIVE_LIMIT = Long.getLong("paper.playerconnection.keepalive", 30) * 1000; // Paper - provide property to set keepalive limit -@@ -91,6 +92,16 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack + public final java.util.Map packCallbacks = new java.util.concurrent.ConcurrentHashMap<>(); // Paper - adventure resource pack callbacks +@@ -92,6 +93,16 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack @Override public void handleKeepAlive(ServerboundKeepAlivePacket packet) { @@ -33,7 +33,7 @@ index 13e064451c4d48e873061b6dea431a6b101de2ee..04b9f56134a24385468c16c61cf84327 //PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); // CraftBukkit // Paper - This shouldn't be on the main thread if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) { int i = (int) (Util.getMillis() - this.keepAliveTime); -@@ -204,6 +215,21 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack +@@ -217,6 +228,21 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack long currentTime = Util.getMillis(); long elapsedTime = currentTime - this.keepAliveTime; @@ -56,7 +56,7 @@ index 13e064451c4d48e873061b6dea431a6b101de2ee..04b9f56134a24385468c16c61cf84327 if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 34afed28faeb56352b48faf8078a5fb07912eb5e..ad239ba9259c5a63b40261ebc44224893496b47d 100644 +index 9c5bba0ae119f8d42274455e322530ceb5f67d9b..a14cf3a5dc2ba265de5e400404afcbd9faa3f25a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -198,6 +198,11 @@ public class PurpurConfig { diff --git a/patches/server/0206-Extended-OfflinePlayer-API.patch b/patches/server/0206-Extended-OfflinePlayer-API.patch index 5539b215b..afa752fbf 100644 --- a/patches/server/0206-Extended-OfflinePlayer-API.patch +++ b/patches/server/0206-Extended-OfflinePlayer-API.patch @@ -223,10 +223,10 @@ index 2bbc39c257965ad91ee360cdfcd3538a0f041c7e..91fbc0cfc84045e32a4ee16fba8164de + // Purpur end - OfflinePlayer API } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a7a702ccb7cab7d68758078927544f2928a5ea62..791f030b4912b46ef70f3099eb3537515464c54b 100644 +index 0b20bb986ee71a57a1c01c85ea7ab1292c9bcc52..df3953b541fc85985ded4a89e03bf5d840f7ed6d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2575,6 +2575,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2599,6 +2599,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return this.getHandle().getAbilities().walkingSpeed * 2f; } diff --git a/patches/server/0264-Remove-Mojang-Profiler.patch b/patches/server/0264-Remove-Mojang-Profiler.patch index de7649fb4..99aeeef75 100644 --- a/patches/server/0264-Remove-Mojang-Profiler.patch +++ b/patches/server/0264-Remove-Mojang-Profiler.patch @@ -861,10 +861,10 @@ index f9c516da1cd706095f391e1f64bce581e8dcd676..5cb6f39830c6d4cf31ba011964edbcf9 this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities())); playerlist.sendLevelInfo(this, worldserver); diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -index 470b34ace7dc356ce59af11962f232466685eb0a..7372713dc195582f9cc994063541a45988b6b457 100644 +index 97914d9c0d8f9ad58fbc79db2afd9cba57bf93b6..da499e0b21eba40d24d95047e3a9220567d4bae7 100644 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -@@ -209,7 +209,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack +@@ -222,7 +222,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack } protected void keepConnectionAlive() { @@ -873,7 +873,7 @@ index 470b34ace7dc356ce59af11962f232466685eb0a..7372713dc195582f9cc994063541a459 // Paper Start - give clients a longer time to respond to pings as per pre 1.12.2 timings // This should effectively place the keepalive handling back to "as it was" before 1.12.2 long currentTime = Util.getMillis(); -@@ -245,7 +245,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack +@@ -258,7 +258,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack } // Paper end diff --git a/patches/server/0267-Debug-Marker-API.patch b/patches/server/0267-Debug-Marker-API.patch index 5f1be1ed8..850a5819d 100644 --- a/patches/server/0267-Debug-Marker-API.patch +++ b/patches/server/0267-Debug-Marker-API.patch @@ -99,10 +99,10 @@ index 648be304b99793fcec850ee6f3965baf1cd679d8..14df9ede813b64f87d97a1ffa9602436 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 791f030b4912b46ef70f3099eb3537515464c54b..dc156ee88786cdb150850cb1adfc4b10b8441b85 100644 +index df3953b541fc85985ded4a89e03bf5d840f7ed6d..c15d14067e9061172ab0b07056ef8b6aa971790c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -3355,5 +3355,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3379,5 +3379,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public void resetIdleTimer() { getHandle().resetLastActionTime(); } diff --git a/patches/server/0271-Add-death-screen-API.patch b/patches/server/0271-Add-death-screen-API.patch index dbbf16cc9..1a2b8a30e 100644 --- a/patches/server/0271-Add-death-screen-API.patch +++ b/patches/server/0271-Add-death-screen-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add death screen API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index dc156ee88786cdb150850cb1adfc4b10b8441b85..342a41804c8a195ba2e185d3ed08e7fc9c25df50 100644 +index c15d14067e9061172ab0b07056ef8b6aa971790c..1b0c44b7d3c0cd4ba4c9de8b63d94a570af2a0fa 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -3393,5 +3393,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3417,5 +3417,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { if (this.getHandle().connection == null) return; this.getHandle().connection.send(new net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket(new net.minecraft.network.protocol.common.custom.GameTestClearMarkersDebugPayload())); }