diff --git a/gradle.properties b/gradle.properties index 0a86da7e8..e7a95f2d5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.purpurmc.purpur version = 1.19.3-R0.1-SNAPSHOT -paperCommit = 81d7ff6e317cee83c971baf7b10046be90a6891b +paperCommit = ad3e1bc12104f1f8ea8bcf9248a606133bfc7780 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0007-Component-related-conveniences.patch b/patches/server/0007-Component-related-conveniences.patch index 1d2f83a6a..ef2d3a2d4 100644 --- a/patches/server/0007-Component-related-conveniences.patch +++ b/patches/server/0007-Component-related-conveniences.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Component related conveniences diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index c2ff5d7e4a9f7477b7b207e9d3fb724137a35f11..f3024b03ff7709893d6e39f54504597bb59f5315 100644 +index 74d332479556ec01cc3fb8d13fe82a77e2fbf3e9..30f95e383a212f396a4e88db29cee18db3c1514b 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1739,6 +1739,26 @@ public class ServerPlayer extends Player { @@ -36,10 +36,10 @@ index c2ff5d7e4a9f7477b7b207e9d3fb724137a35f11..f3024b03ff7709893d6e39f54504597b public void displayClientMessage(Component message, boolean overlay) { this.sendSystemMessage(message, overlay); diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index a01654bb553c00459e64f16e5ccc91b70cc84444..83b080cfd15b03878acca503f0f416166fbc4e5c 100644 +index 835e439a1af327c67558653ef79ef7e59692a976..e978172bacfba940a112c35bc666a59b2e1fa83b 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -1013,6 +1013,20 @@ public abstract class PlayerList { +@@ -1015,6 +1015,20 @@ public abstract class PlayerList { } // CraftBukkit end diff --git a/patches/server/0010-Barrels-and-enderchests-6-rows.patch b/patches/server/0010-Barrels-and-enderchests-6-rows.patch index 3fb41c07c..524c774ad 100644 --- a/patches/server/0010-Barrels-and-enderchests-6-rows.patch +++ b/patches/server/0010-Barrels-and-enderchests-6-rows.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Barrels and enderchests 6 rows diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 83b080cfd15b03878acca503f0f416166fbc4e5c..168abc1f0c795bf840ca87b301dfa85ac0b5dd16 100644 +index e978172bacfba940a112c35bc666a59b2e1fa83b..f1c3737d5cff959db2cdb3be672987c603c1ca6c 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -1138,6 +1138,27 @@ public abstract class PlayerList { +@@ -1140,6 +1140,27 @@ public abstract class PlayerList { player.getBukkitEntity().recalculatePermissions(); // CraftBukkit this.server.getCommands().sendCommands(player); } // Paper @@ -37,7 +37,7 @@ index 83b080cfd15b03878acca503f0f416166fbc4e5c..168abc1f0c795bf840ca87b301dfa85a public boolean isWhiteListed(GameProfile profile) { diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index e0f3375653db94d5fd2e154b72cae3d2113aaab1..aa41679dec3c87c5af8721c710adcad7cdd65f8b 100644 +index 34906d3237388d548604de2577f64ff084ed0838..a0cd61f73bdc50cd29125c5e3f9fc47c3c3c5608 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -183,6 +183,7 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0018-Player-invulnerabilities.patch b/patches/server/0018-Player-invulnerabilities.patch index d5dd10831..f99bbfa39 100644 --- a/patches/server/0018-Player-invulnerabilities.patch +++ b/patches/server/0018-Player-invulnerabilities.patch @@ -108,10 +108,10 @@ index 96dbffd6e892734a120bcb3b19bd15bdf027df8f..6b9f618c23c329235d8d62347aa3711e this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit // Paper end diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index c8dedd2bfcc633ac1be891c8016dc9384e199796..0e09db289dadb812faf6850d6cbaf202fcc2facf 100644 +index f1c3737d5cff959db2cdb3be672987c603c1ca6c..1a5863a192caadac38c47a418f298394c11b8263 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -953,6 +953,8 @@ public abstract class PlayerList { +@@ -955,6 +955,8 @@ public abstract class PlayerList { } // Paper end diff --git a/patches/server/0048-Add-permission-for-F3-N-debug.patch b/patches/server/0048-Add-permission-for-F3-N-debug.patch index 04b9e23b2..3aba45c58 100644 --- a/patches/server/0048-Add-permission-for-F3-N-debug.patch +++ b/patches/server/0048-Add-permission-for-F3-N-debug.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add permission for F3+N debug diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index a9ed0ddc7c5bedb4bca774caa583a6889259e4c0..f2cfcefefaf71ba0f49a1aea34886fd9cb7b69e2 100644 +index 1a5863a192caadac38c47a418f298394c11b8263..1cc2d58a4f6ddda50bc8368a5f0a0c44eb8c3395 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -1132,6 +1132,7 @@ public abstract class PlayerList { +@@ -1134,6 +1134,7 @@ public abstract class PlayerList { } else { b0 = (byte) (24 + permissionLevel); } diff --git a/patches/server/0278-Remove-Timings.patch b/patches/server/0278-Remove-Timings.patch index acbb43b33..143a122c6 100644 --- a/patches/server/0278-Remove-Timings.patch +++ b/patches/server/0278-Remove-Timings.patch @@ -676,10 +676,10 @@ index 3f547b68a304d47249162154e11ebe6528f5ecea..d468bb5e61ba25cfb2b462e2d0852256 } // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 03a1e1a9af8ed6ac922748a685a180defcb85997..c34c5368e336ba4b181a95932a9b40cb4f50ae1d 100644 +index 891ff89715aef3c020e5869ebe500aa3c2fd88e6..82093c413722e280b9fcb46fb0ba03ca629e54fa 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -1226,7 +1226,7 @@ public abstract class PlayerList { +@@ -1228,7 +1228,7 @@ public abstract class PlayerList { public void saveAll(int interval) { io.papermc.paper.util.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main @@ -688,7 +688,7 @@ index 03a1e1a9af8ed6ac922748a685a180defcb85997..c34c5368e336ba4b181a95932a9b40cb int numSaved = 0; long now = MinecraftServer.currentTick; for (int i = 0; i < this.players.size(); ++i) { -@@ -1237,7 +1237,7 @@ public abstract class PlayerList { +@@ -1239,7 +1239,7 @@ public abstract class PlayerList { } // Paper end }