diff --git a/gradle.properties b/gradle.properties index fc37dfbe0..1b6765d8d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.purpurmc.purpur version = 1.19.2-R0.1-SNAPSHOT -paperCommit = 3f0415b45303568fe5d362dc3fa27b3a4ca680eb +paperCommit = 9592da1f84db1565bc67072504a30f488cf782e0 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch index 3eedad153..fa3eac84c 100644 --- a/patches/server/0001-Pufferfish-Server-Changes.patch +++ b/patches/server/0001-Pufferfish-Server-Changes.patch @@ -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 081c7160cf727646cdec4cd551dbc2aad56326f6..06d31a03ec7d049649e94d013429d2197b697545 100644 +index dd9ab51e904be2f2f2a2981d4f0f6638a6895e8d..e7fcef13bfbbe7745ea39f1ceaf7652459dde8b9 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 S spin(Function serverFactory) { AtomicReference atomicreference = new AtomicReference(); -@@ -1656,7 +1658,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop pageList = packet.getPages(); -@@ -2365,6 +2366,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2368,6 +2369,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } private boolean updateChatOrder(Instant timestamp) { @@ -5664,7 +5664,7 @@ index b1992ed5136cc7dcf04219868b94b3c37ae36b4b..5b5339cba819368f4d6b7eaf404fa59b @Nullable diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 964ec590ef5302576ecb3ba2b8ea95dbc2acf103..bfd4520ef6f085685a25cf7f49907e16202e6386 100644 +index b777c1294370bdc68bc6265b039e2a405d89f2f5..a464d0a771875d3574fe4e461abe7212a933baf5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -248,7 +248,7 @@ import javax.annotation.Nullable; // Paper diff --git a/patches/server/0003-Rebrand.patch b/patches/server/0003-Rebrand.patch index 463532d93..a51161cf9 100644 --- a/patches/server/0003-Rebrand.patch +++ b/patches/server/0003-Rebrand.patch @@ -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 06d31a03ec7d049649e94d013429d2197b697545..f0eb6be38cb2c53f4f19d4e18a8d03232375fc6b 100644 +index e7fcef13bfbbe7745ea39f1ceaf7652459dde8b9..212ce23d04cadc695e729c09e2dec7179929ca71 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 cachedSingleHashSet; // Paper diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d18b82f1f66cd10250a12222dfb983ef57629738..c23ffdd17ba9fdf88fdce8cfe86f58ab855fa87c 100644 +index 9aab29dd7a09c306d6c0e1e8143daf005d611d65..0f9dea99893581122a6d5f9176b374c1c815973c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -3645,6 +3645,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3653,6 +3653,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic private static final ResourceLocation CUSTOM_UNREGISTER = new ResourceLocation("unregister"); private static final ResourceLocation MINECRAFT_BRAND = new ResourceLocation("brand"); // Paper - Brand support @@ -28,7 +28,7 @@ index d18b82f1f66cd10250a12222dfb983ef57629738..c23ffdd17ba9fdf88fdce8cfe86f58ab @Override public void handleCustomPayload(ServerboundCustomPayloadPacket packet) { -@@ -3669,6 +3670,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3677,6 +3678,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t unregister custom payload", ex); this.disconnect("Invalid payload UNREGISTER!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause } @@ -43,7 +43,7 @@ index d18b82f1f66cd10250a12222dfb983ef57629738..c23ffdd17ba9fdf88fdce8cfe86f58ab try { byte[] data = new byte[packet.data.readableBytes()]; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ef9c3a7b15a4901e1662e6d55504b9cbbb804ad3..a20e1a533e9f764fbf00e768fd8286c8f7868a78 100644 +index 067d64ce06f626ce90b3ccf608d98f3c64fce335..6260f4246b24f5037e3cf718a50be3a70680132e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2897,4 +2897,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0008-Ridables.patch b/patches/server/0008-Ridables.patch index 530083a1a..2c054edd7 100644 --- a/patches/server/0008-Ridables.patch +++ b/patches/server/0008-Ridables.patch @@ -22,7 +22,7 @@ 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 f0eb6be38cb2c53f4f19d4e18a8d03232375fc6b..1e0dd0f16081281c18e6c131a3d8b7f83b11805b 100644 +index 212ce23d04cadc695e729c09e2dec7179929ca71..246ce99830ba803abe487e3c43f453e75d9c5c1f 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 { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index e4a341351a5f4e1f3ffed1708eb3a1fd81b94f0f..a12238ee1dc58232f04586f60fb7f662eac22a10 100644 +index d5b17e284c7305b51f21f908bc2b12b3927d7790..9fe1f5aea08be6395e16de18e5abfe72a150280f 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -219,6 +219,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -66,10 +66,10 @@ index 2049fa1008be5208d9bb168dd65483613a7296f1..8e3e3dbbea328f76a790477545b46d2d public void doTick() { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c23ffdd17ba9fdf88fdce8cfe86f58ab855fa87c..667c72da85b4d6b778739402f4bb1f9f24f7d705 100644 +index 0f9dea99893581122a6d5f9176b374c1c815973c..f11f917130298aeca48fa51c1d9ea8150df60d8b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2918,6 +2918,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2921,6 +2921,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic ServerGamePacketListenerImpl.this.cserver.getPluginManager().callEvent(event); diff --git a/patches/server/0012-AFK-API.patch b/patches/server/0012-AFK-API.patch index a2e82546e..de36ca7e2 100644 --- a/patches/server/0012-AFK-API.patch +++ b/patches/server/0012-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 1628989f81e76fc61b2a894f7037f5630a1491bc..c72b20e3e7eda999c6da07e7e6fb46826c4369a9 100644 +index 8e3e3dbbea328f76a790477545b46d2d3013546b..905aa1311791564720e541fc4fbe1e4f8d38a0e7 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2001,8 +2001,58 @@ public class ServerPlayer extends Player { @@ -68,10 +68,10 @@ index 1628989f81e76fc61b2a894f7037f5630a1491bc..c72b20e3e7eda999c6da07e7e6fb4682 return this.stats; } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 33ec7ca690cf1400f6b1fcbfa44686f790f97ec3..094698b4bf0546704d5ade47a17988474344d244 100644 +index f11f917130298aeca48fa51c1d9ea8150df60d8b..b10a5f39145cf62b981fad6595e42ac09602d510 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -340,6 +340,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -343,6 +343,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic private boolean justTeleported = false; private boolean hasMoved; // Spigot @@ -92,7 +92,7 @@ index 33ec7ca690cf1400f6b1fcbfa44686f790f97ec3..094698b4bf0546704d5ade47a1798847 public CraftPlayer getCraftPlayer() { return (this.player == null) ? null : (CraftPlayer) this.player.getBukkitEntity(); } -@@ -442,6 +456,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -445,6 +459,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } if (this.player.getLastActionTime() > 0L && this.server.getPlayerIdleTimeout() > 0 && Util.getMillis() - this.player.getLastActionTime() > (long) (this.server.getPlayerIdleTimeout() * 1000 * 60) && !this.player.wonGame) { // Paper - Prevent AFK kick while watching end credits. @@ -105,7 +105,7 @@ index 33ec7ca690cf1400f6b1fcbfa44686f790f97ec3..094698b4bf0546704d5ade47a1798847 this.player.resetLastActionTime(); // CraftBukkit - SPIGOT-854 this.disconnect(Component.translatable("multiplayer.disconnect.idling"), org.bukkit.event.player.PlayerKickEvent.Cause.IDLING); // Paper - kick event cause } -@@ -747,6 +767,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -750,6 +770,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic this.lastYaw = to.getYaw(); this.lastPitch = to.getPitch(); @@ -114,7 +114,7 @@ index 33ec7ca690cf1400f6b1fcbfa44686f790f97ec3..094698b4bf0546704d5ade47a1798847 // Skip the first time we do this if (true) { // Spigot - don't skip any move events Location oldTo = to.clone(); -@@ -1551,7 +1573,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1554,7 +1576,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic if (!this.player.isChangingDimension() && d11 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.gameMode.isCreative() && this.player.gameMode.getGameModeForPlayer() != GameType.SPECTATOR) { // Spigot flag2 = true; // Paper - diff on change, this should be moved wrongly @@ -123,7 +123,7 @@ index 33ec7ca690cf1400f6b1fcbfa44686f790f97ec3..094698b4bf0546704d5ade47a1798847 } this.player.absMoveTo(d0, d1, d2, f, f1); -@@ -1601,6 +1623,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1604,6 +1626,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic this.lastYaw = to.getYaw(); this.lastPitch = to.getPitch(); @@ -213,7 +213,7 @@ index 3f458ddd4dc04ed28510a212be76bb19e7f6a61e..a36469186f72eccf8c4428d920d0583b 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 a20e1a533e9f764fbf00e768fd8286c8f7868a78..fd5906dd18a4ff377c6e2dd180008124faa9600d 100644 +index 6260f4246b24f5037e3cf718a50be3a70680132e..c57264e4f4284550d674a9c4083cc9cfbeb355bb 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -442,10 +442,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0014-Configurable-server-mod-name.patch b/patches/server/0014-Configurable-server-mod-name.patch index ee524f170..3104b534e 100644 --- a/patches/server/0014-Configurable-server-mod-name.patch +++ b/patches/server/0014-Configurable-server-mod-name.patch @@ -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 1e0dd0f16081281c18e6c131a3d8b7f83b11805b..48bf3a9938aae8d6cc847a80cf95cfda305414f5 100644 +index 246ce99830ba803abe487e3c43f453e75d9c5c1f..298e63f4acdcd52158eff83c5ee60846c6628e29 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1659,7 +1659,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop= 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 -@@ -3630,6 +3646,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3638,6 +3654,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @Override public void handleKeepAlive(ServerboundKeepAlivePacket packet) { diff --git a/patches/server/0077-Allow-color-codes-in-books.patch b/patches/server/0077-Allow-color-codes-in-books.patch index ead51439d..8b296d6dc 100644 --- a/patches/server/0077-Allow-color-codes-in-books.patch +++ b/patches/server/0077-Allow-color-codes-in-books.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Allow color codes in books diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b996a4903fcbaf308ff141b9c05d516832fcee47..0f90a7be083723e72dc6f24087f981790dd98eec 100644 +index accc5e15eef680c82bab4fdcf759d7b17e57dd67..9ad05f4e414e147ff1bdb90d83fa700b30d311a5 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1345,13 +1345,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1348,13 +1348,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic itemstack1.setTag(nbttagcompound.copy()); } @@ -28,7 +28,7 @@ index b996a4903fcbaf308ff141b9c05d516832fcee47..0f90a7be083723e72dc6f24087f98179 this.updateBookPages(pages, (s) -> { return Component.Serializer.toJson(Component.literal(s)); -@@ -1363,10 +1366,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1366,10 +1369,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic public void updateBookPages(List list, UnaryOperator unaryoperator, ItemStack itemstack, int slot, ItemStack handItem) { // CraftBukkit ListTag nbttaglist = new ListTag(); @@ -44,7 +44,7 @@ index b996a4903fcbaf308ff141b9c05d516832fcee47..0f90a7be083723e72dc6f24087f98179 Objects.requireNonNull(nbttaglist); stream.forEach(nbttaglist::add); -@@ -1376,11 +1382,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1379,11 +1385,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic for (int j = list.size(); i < j; ++i) { FilteredText filteredtext = (FilteredText) list.get(i); @@ -58,7 +58,7 @@ index b996a4903fcbaf308ff141b9c05d516832fcee47..0f90a7be083723e72dc6f24087f98179 } } -@@ -1393,6 +1399,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1396,6 +1402,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic this.player.getInventory().setItem(slot, CraftEventFactory.handleEditBookEvent(player, slot, handItem, itemstack)); // CraftBukkit // Paper - Don't ignore result (see other callsite for handleEditBookEvent) } diff --git a/patches/server/0078-Entity-lifespan.patch b/patches/server/0078-Entity-lifespan.patch index 01989962e..c78f54034 100644 --- a/patches/server/0078-Entity-lifespan.patch +++ b/patches/server/0078-Entity-lifespan.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Entity lifespan diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 31218d0f09b011617300e4297ca7506f50494684..6f86c57b298067117b0c8f7d738ba20d1af98fea 100644 +index 9ad05f4e414e147ff1bdb90d83fa700b30d311a5..bdabf2ce37b8662fe3d2387b791eee217ce7b61c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2973,6 +2973,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2976,6 +2976,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } if (entity.distanceToSqr(this.player.getEyePosition()) < ServerGamePacketListenerImpl.MAX_INTERACTION_DISTANCE) { diff --git a/patches/server/0127-PlayerBookTooLargeEvent.patch b/patches/server/0127-PlayerBookTooLargeEvent.patch index d004235a2..c8208e54a 100644 --- a/patches/server/0127-PlayerBookTooLargeEvent.patch +++ b/patches/server/0127-PlayerBookTooLargeEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] PlayerBookTooLargeEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 666c5b9792da335bc85a964b15296fcecbf4d43f..57ffb4b246f38d81e19e0f369a245b6beb2b6d41 100644 +index bdabf2ce37b8662fe3d2387b791eee217ce7b61c..1cee1e7f228d52af4f166d122f21ad37c3704a46 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1265,10 +1265,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1268,10 +1268,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic int maxBookPageSize = io.papermc.paper.configuration.GlobalConfiguration.get().itemValidation.bookSize.pageMax; double multiplier = Math.max(0.3D, Math.min(1D, io.papermc.paper.configuration.GlobalConfiguration.get().itemValidation.bookSize.totalMultiplier)); long byteAllowed = maxBookPageSize; @@ -21,7 +21,7 @@ index 666c5b9792da335bc85a964b15296fcecbf4d43f..57ffb4b246f38d81e19e0f369a245b6b server.scheduleOnMain(() -> this.disconnect("Book too large!", org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION)); // Paper - kick event cause return; } -@@ -1292,6 +1294,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1295,6 +1297,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic if (byteTotal > byteAllowed) { ServerGamePacketListenerImpl.LOGGER.warn(this.player.getScoreboardName() + " tried to send too large of a book. Book Size: " + byteTotal + " - Allowed: "+ byteAllowed + " - Pages: " + pageList.size()); diff --git a/patches/server/0140-Dont-run-with-scissors.patch b/patches/server/0140-Dont-run-with-scissors.patch index 88ad9b00f..5144dac54 100644 --- a/patches/server/0140-Dont-run-with-scissors.patch +++ b/patches/server/0140-Dont-run-with-scissors.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Dont run with scissors! diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 57ffb4b246f38d81e19e0f369a245b6beb2b6d41..72422e08da8bb07181b777b073d12b0c87e2b8ea 100644 +index 1cee1e7f228d52af4f166d122f21ad37c3704a46..c914fbbb8b63506e345c747ff5ef0bbbb471c9eb 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1699,6 +1699,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1702,6 +1702,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic this.player.resetFallDistance(); } @@ -22,7 +22,7 @@ index 57ffb4b246f38d81e19e0f369a245b6beb2b6d41..72422e08da8bb07181b777b073d12b0c this.player.checkMovementStatistics(this.player.getX() - d3, this.player.getY() - d4, this.player.getZ() - d5); this.lastGoodX = this.player.getX(); this.lastGoodY = this.player.getY(); -@@ -1732,6 +1739,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1735,6 +1742,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } // Paper end - optimise out extra getCubes diff --git a/patches/server/0210-Add-compass-command.patch b/patches/server/0210-Add-compass-command.patch index 12f6ea9ca..a6d85e8ca 100644 --- a/patches/server/0210-Add-compass-command.patch +++ b/patches/server/0210-Add-compass-command.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add compass command diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java -index dc76507dd19e263cc3a0d566c0ea237ad1203a63..e04c2f0cdba79526ca03faa03409a3cb4767aad4 100644 +index 6a044a9c97db9bba75f8dbbaa8515e3167841855..edd378813873ed367784379b0f1666d1ccf2194d 100644 --- a/src/main/java/net/minecraft/commands/Commands.java +++ b/src/main/java/net/minecraft/commands/Commands.java @@ -212,6 +212,7 @@ public class Commands { @@ -174,7 +174,7 @@ index d38b3c4a722396cc3b61a9a8ed7e39cea4ae65cb..d333334f323049ca97e756324cff0b23 } diff --git a/src/main/java/org/purpurmc/purpur/task/CompassTask.java b/src/main/java/org/purpurmc/purpur/task/CompassTask.java new file mode 100644 -index 0000000000000000000000000000000000000000..bdb214bc2e0d944a26c825c1124d23d4fee2eca9 +index 0000000000000000000000000000000000000000..5c06909e343f06b00816fcf227c7080aec8057ce --- /dev/null +++ b/src/main/java/org/purpurmc/purpur/task/CompassTask.java @@ -0,0 +1,68 @@ @@ -206,7 +206,7 @@ index 0000000000000000000000000000000000000000..bdb214bc2e0d944a26c825c1124d23d4 + } + tick = 0; + -+ MinecraftServer.getServer().levels.forEach((key, level) -> { ++ MinecraftServer.getServer().getAllLevels().forEach((level) -> { + if (level.purpurConfig.compassItemShowsBossBar) { + level.players.forEach(player -> { + if (!player.compassBar()) { diff --git a/patches/server/0227-Shift-right-click-to-use-exp-for-mending.patch b/patches/server/0227-Shift-right-click-to-use-exp-for-mending.patch index 924aaa75b..384a73a9e 100644 --- a/patches/server/0227-Shift-right-click-to-use-exp-for-mending.patch +++ b/patches/server/0227-Shift-right-click-to-use-exp-for-mending.patch @@ -36,10 +36,10 @@ index 28463bca77d62ad9175a55cffc92110ffa16fadc..bd77301ef6cde21e1ee1966d2ffa4186 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 72422e08da8bb07181b777b073d12b0c87e2b8ea..aa18ee0cb53f527c0043cdbf39d3848c6f660b8b 100644 +index c914fbbb8b63506e345c747ff5ef0bbbb471c9eb..7f3c1c9776aab0b92cac6feb1845e55a701a5705 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2098,6 +2098,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2101,6 +2101,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic boolean cancelled; if (movingobjectposition == null || movingobjectposition.getType() != HitResult.Type.BLOCK) { diff --git a/patches/server/0238-Signs-allow-color-codes.patch b/patches/server/0238-Signs-allow-color-codes.patch index 6dddd0512..62f96c6ce 100644 --- a/patches/server/0238-Signs-allow-color-codes.patch +++ b/patches/server/0238-Signs-allow-color-codes.patch @@ -17,10 +17,10 @@ index 68008facb6cfcccbcb7501c84c5da9014321ce4a..4d28a1f9fe43bb8e9f5ffaf06895c94f this.connection.send(new ClientboundBlockUpdatePacket(this.level, sign.getBlockPos())); this.connection.send(new ClientboundOpenSignEditorPacket(sign.getBlockPos())); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a9a994cb3c881f9c2ffe2f80d5179f7f8863acb8..5390b04e4e20b00e53875325c59f2182ed7163b2 100644 +index 7f3c1c9776aab0b92cac6feb1845e55a701a5705..1eafc5667fd6a9746df7f4233cb021c2c435347e 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -3654,11 +3654,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3662,11 +3662,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic for (int i = 0; i < signText.size(); ++i) { FilteredText filteredtext = (FilteredText) signText.get(i); diff --git a/patches/server/0275-Add-log-suppression-for-sent-expired-chat.patch b/patches/server/0275-Add-log-suppression-for-sent-expired-chat.patch index f13853b53..d558b5daf 100644 --- a/patches/server/0275-Add-log-suppression-for-sent-expired-chat.patch +++ b/patches/server/0275-Add-log-suppression-for-sent-expired-chat.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add log suppression for sent expired chat diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 5390b04e4e20b00e53875325c59f2182ed7163b2..1e5645a23f2ded431dac29cce0d437662c2f1464 100644 +index 1eafc5667fd6a9746df7f4233cb021c2c435347e..25c9f742ad12a3ccab9860b4fc1de3d77ea9de82 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2689,7 +2689,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2692,7 +2692,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } } diff --git a/patches/server/0279-Option-to-disable-kick-for-out-of-order-chat.patch b/patches/server/0279-Option-to-disable-kick-for-out-of-order-chat.patch index 20ae32733..aa853a1c8 100644 --- a/patches/server/0279-Option-to-disable-kick-for-out-of-order-chat.patch +++ b/patches/server/0279-Option-to-disable-kick-for-out-of-order-chat.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Option to disable kick for out of order chat diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1e5645a23f2ded431dac29cce0d437662c2f1464..2defad9eec0c7eae12b0688e08959c17f821228d 100644 +index 25c9f742ad12a3ccab9860b4fc1de3d77ea9de82..cf24035eb1d145c2118d3ee57527f7cf9d2246fc 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2454,7 +2454,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2457,7 +2457,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic do { instant1 = (Instant) this.lastChatTimeStamp.get(); if (timestamp.isBefore(instant1)) { diff --git a/patches/server/0286-Allow-custom-ChatDecorators.patch b/patches/server/0286-Allow-custom-ChatDecorators.patch index d7bf75e9b..c67164a96 100644 --- a/patches/server/0286-Allow-custom-ChatDecorators.patch +++ b/patches/server/0286-Allow-custom-ChatDecorators.patch @@ -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 89c672b03e7bc932e2afb46e708a49a8fe66ff76..100460d26fbb645a138f1883335ce7838b243a19 100644 +index be18103099ba47711bcd36c6f9379fb3d05aaa4e..508a3fa75a900fb5dc7729aebd3b9c7116aac66c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -2629,6 +2629,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { this.executeBlocking(() -> { this.saveDebugReport(path.resolve("server")); -@@ -2508,40 +2508,40 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop