From 5850d9fb6a4fc85bee0ad247df22a18514e2e686 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 14 Mar 2022 19:07:36 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@a5be178 Use correct toX/Y/Z in player move packet handling --- gradle.properties | 2 +- patches/server/0001-Pufferfish-Server-Changes.patch | 4 ++-- patches/server/0004-Purpur-client-support.patch | 6 +++--- patches/server/0006-Ridables.patch | 4 ++-- patches/server/0011-AFK-API.patch | 10 +++++----- patches/server/0018-Player-invulnerabilities.patch | 4 ++-- .../server/0021-Alternative-Keepalive-Handling.patch | 4 ++-- patches/server/0078-Allow-color-codes-in-books.patch | 10 +++++----- patches/server/0079-Entity-lifespan.patch | 4 ++-- patches/server/0129-PlayerBookTooLargeEvent.patch | 6 +++--- patches/server/0142-Dont-run-with-scissors.patch | 6 +++--- ...0231-Shift-right-click-to-use-exp-for-mending.patch | 6 +++--- patches/server/0242-Signs-allow-color-codes.patch | 6 +++--- 13 files changed, 36 insertions(+), 36 deletions(-) diff --git a/gradle.properties b/gradle.properties index b6bdbe0d7..452cb63b6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.purpurmc.purpur version = 1.18.2-R0.1-SNAPSHOT -paperCommit = c8e49cc53e6f15ebc2e26a9a595f31890ee2b7af +paperCommit = a5be178ac34b26c80dae2c6b7c1f9a685190c2b8 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 418efacaa..8eced2b77 100644 --- a/patches/server/0001-Pufferfish-Server-Changes.patch +++ b/patches/server/0001-Pufferfish-Server-Changes.patch @@ -2427,10 +2427,10 @@ index a08320807dcc49707bc167d196ba7f954dbf6f03..af063e08d33b15892079331e8bff86a9 this.getRandomBlockPosition(j, 0, k, 15, blockposition); int normalY = chunk.getHeight(Heightmap.Types.MOTION_BLOCKING, blockposition.getX() & 15, blockposition.getZ() & 15) + 1; diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index dea4d455d05945505f9ef33793a61783b521bf11..bc67e1a997d59408b00c333184d9f8dcc6cb262a 100644 +index 68e1ab0057452228817ecbc6556338a8906c2538..5bc9c51cdfd1f9d1f15d0717575899e2f038c95c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1107,6 +1107,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -1116,6 +1116,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @Override public void handleEditBook(ServerboundEditBookPacket packet) { diff --git a/patches/server/0004-Purpur-client-support.patch b/patches/server/0004-Purpur-client-support.patch index ef204d360..8f155ed2f 100644 --- a/patches/server/0004-Purpur-client-support.patch +++ b/patches/server/0004-Purpur-client-support.patch @@ -17,10 +17,10 @@ index e74c13e7aaa144fcd07036de70e80bebf0be698a..b3459253bddd74ecda2b534d4bd6877b public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet 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 bc67e1a997d59408b00c333184d9f8dcc6cb262a..353848667006bc386fe5d3fceb61ac58be20a941 100644 +index 5bc9c51cdfd1f9d1f15d0717575899e2f038c95c..a4ea4ff317b71ed2e64a6036cbdb7291d248d982 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -3164,6 +3164,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -3173,6 +3173,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser 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 bc67e1a997d59408b00c333184d9f8dcc6cb262a..353848667006bc386fe5d3fceb61ac58 @Override public void handleCustomPayload(ServerboundCustomPayloadPacket packet) { -@@ -3188,6 +3189,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -3197,6 +3198,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser 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 } diff --git a/patches/server/0006-Ridables.patch b/patches/server/0006-Ridables.patch index 6bb230faf..edfedd39f 100644 --- a/patches/server/0006-Ridables.patch +++ b/patches/server/0006-Ridables.patch @@ -66,10 +66,10 @@ index 4da6ef8affbec3fe3311a5c6282daf7f41ddccbc..2ec7392b94e6351190a72e59fac49a88 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 353848667006bc386fe5d3fceb61ac58be20a941..d61e30e19c1144a3610f92028c047e0f11a13aa9 100644 +index a4ea4ff317b71ed2e64a6036cbdb7291d248d982..334e73a646bb02fcfef331229a07e790d9ec6c67 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2466,6 +2466,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -2475,6 +2475,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser ServerGamePacketListenerImpl.this.cserver.getPluginManager().callEvent(event); diff --git a/patches/server/0011-AFK-API.patch b/patches/server/0011-AFK-API.patch index 580ae2e37..7d021d7c6 100644 --- a/patches/server/0011-AFK-API.patch +++ b/patches/server/0011-AFK-API.patch @@ -68,7 +68,7 @@ index 2ec7392b94e6351190a72e59fac49a883a058752..b2e9d6a2ee654caa6e129d63a6e23f88 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 d61e30e19c1144a3610f92028c047e0f11a13aa9..1646852179a41da2380b0b67cbb183d287a07ebf 100644 +index 334e73a646bb02fcfef331229a07e790d9ec6c67..81de9d96c1d3b36a3616ba824878c04b4d4fa745 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -292,6 +292,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @@ -105,7 +105,7 @@ index d61e30e19c1144a3610f92028c047e0f11a13aa9..1646852179a41da2380b0b67cbb183d2 this.player.resetLastActionTime(); // CraftBukkit - SPIGOT-854 this.disconnect(new TranslatableComponent("multiplayer.disconnect.idling"), org.bukkit.event.player.PlayerKickEvent.Cause.IDLING); // Paper - kick event cause } -@@ -667,6 +687,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -676,6 +696,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser this.lastYaw = to.getYaw(); this.lastPitch = to.getPitch(); @@ -114,7 +114,7 @@ index d61e30e19c1144a3610f92028c047e0f11a13aa9..1646852179a41da2380b0b67cbb183d2 // Skip the first time we do this if (true) { // Spigot - don't skip any move events Location oldTo = to.clone(); -@@ -1439,7 +1461,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -1448,7 +1470,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser 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 d61e30e19c1144a3610f92028c047e0f11a13aa9..1646852179a41da2380b0b67cbb183d2 } this.player.absMoveTo(d0, d1, d2, f, f1); -@@ -1489,6 +1511,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -1498,6 +1520,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser this.lastYaw = to.getYaw(); this.lastPitch = to.getPitch(); @@ -182,7 +182,7 @@ index e752c83df50fb9b670ecea2abc95426c2a009b6f..baa4f9026d31de92210300ecb8ee8c1b if (baseEntity == null) { if (this.isCombat && (!targetEntity.canBeSeenAsEnemy() || targetEntity.level.getDifficulty() == Difficulty.PEACEFUL)) { 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 60120fcfc2127a53d90ce5bd3a819eb76801c9e8..eaadaa3a20d05f020d683a418fc0eab3e2bbac77 100644 +index e13b2b88e427aba1c4e6a924f4c8474d60976eb1..0228eb3bd816c35fcf4607f0a140b1e6ef56decd 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -196,6 +196,13 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0018-Player-invulnerabilities.patch b/patches/server/0018-Player-invulnerabilities.patch index 49163790b..6abb6e50d 100644 --- a/patches/server/0018-Player-invulnerabilities.patch +++ b/patches/server/0018-Player-invulnerabilities.patch @@ -82,10 +82,10 @@ index b2e9d6a2ee654caa6e129d63a6e23f88252ad35d..d86def0cc42af5ccfef69ff43ffac712 public Scoreboard getScoreboard() { return this.getBukkitEntity().getScoreboard().getHandle(); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1646852179a41da2380b0b67cbb183d287a07ebf..e755e0b0bb8191af917f4ec383d2aaf70775d508 100644 +index 81de9d96c1d3b36a3616ba824878c04b4d4fa745..cd2b66289bd3bfa62460923ce00883209451903d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1974,12 +1974,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -1983,12 +1983,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @Override public void handleResourcePackResponse(ServerboundResourcePackPacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); diff --git a/patches/server/0021-Alternative-Keepalive-Handling.patch b/patches/server/0021-Alternative-Keepalive-Handling.patch index 819565c1c..f8c18e4f7 100644 --- a/patches/server/0021-Alternative-Keepalive-Handling.patch +++ b/patches/server/0021-Alternative-Keepalive-Handling.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Alternative Keepalive Handling diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index e755e0b0bb8191af917f4ec383d2aaf70775d508..893fdd70090b182f783529681edd5f35beeebad2 100644 +index cd2b66289bd3bfa62460923ce00883209451903d..97de6385d09e561f24fd4b80aa53c61829aa4d59 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -227,6 +227,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @@ -38,7 +38,7 @@ index e755e0b0bb8191af917f4ec383d2aaf70775d508..893fdd70090b182f783529681edd5f35 if (this.keepAlivePending) { 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 -@@ -3156,6 +3172,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -3165,6 +3181,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @Override public void handleKeepAlive(ServerboundKeepAlivePacket packet) { diff --git a/patches/server/0078-Allow-color-codes-in-books.patch b/patches/server/0078-Allow-color-codes-in-books.patch index 407eb4155..9e496b1eb 100644 --- a/patches/server/0078-Allow-color-codes-in-books.patch +++ b/patches/server/0078-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 893fdd70090b182f783529681edd5f35beeebad2..fa3b4d98972838850c6487b941ea9243c26ab01c 100644 +index 97de6385d09e561f24fd4b80aa53c61829aa4d59..4a997a60baa9051f037b67ad60c09fb532b76114 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1231,13 +1231,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -1240,13 +1240,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser itemstack1.setTag(nbttagcompound.copy()); } @@ -28,7 +28,7 @@ index 893fdd70090b182f783529681edd5f35beeebad2..fa3b4d98972838850c6487b941ea9243 this.updateBookPages(pages, (s) -> { return Component.Serializer.toJson(new TextComponent(s)); -@@ -1249,10 +1252,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -1258,10 +1261,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser private void updateBookPages(List list, UnaryOperator unaryoperator, ItemStack itemstack, int slot, ItemStack handItem) { // CraftBukkit ListTag nbttaglist = new ListTag(); @@ -44,7 +44,7 @@ index 893fdd70090b182f783529681edd5f35beeebad2..fa3b4d98972838850c6487b941ea9243 Objects.requireNonNull(nbttaglist); stream.forEach(nbttaglist::add); -@@ -1262,10 +1268,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -1271,10 +1277,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser for (int j = list.size(); i < j; ++i) { TextFilter.FilteredText itextfilter_a = (TextFilter.FilteredText) list.get(i); @@ -57,7 +57,7 @@ index 893fdd70090b182f783529681edd5f35beeebad2..fa3b4d98972838850c6487b941ea9243 if (!s.equals(s1)) { nbttagcompound.putString(String.valueOf(i), (String) unaryoperator.apply(s1)); -@@ -1281,6 +1287,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -1290,6 +1296,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser 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/0079-Entity-lifespan.patch b/patches/server/0079-Entity-lifespan.patch index de27a88dd..8a60fc904 100644 --- a/patches/server/0079-Entity-lifespan.patch +++ b/patches/server/0079-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 fa3b4d98972838850c6487b941ea9243c26ab01c..c0889697ed81298b66e418d53abd7598e1a6dc3f 100644 +index 4a997a60baa9051f037b67ad60c09fb532b76114..06c02aa50d3ece744678ba99c21237b02c0a8aca 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2521,6 +2521,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -2530,6 +2530,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser double d0 = 36.0D; if (this.player.distanceToSqr(entity) < 36.0D) { diff --git a/patches/server/0129-PlayerBookTooLargeEvent.patch b/patches/server/0129-PlayerBookTooLargeEvent.patch index dfe5bdf3f..0acbf984f 100644 --- a/patches/server/0129-PlayerBookTooLargeEvent.patch +++ b/patches/server/0129-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 c0889697ed81298b66e418d53abd7598e1a6dc3f..d68de70beb0634004224fe082566f33484924b97 100644 +index 06c02aa50d3ece744678ba99c21237b02c0a8aca..8620dbcdc25be8f94535181f0297a2c70ae58bda 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1153,10 +1153,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -1162,10 +1162,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser int maxBookPageSize = com.destroystokyo.paper.PaperConfig.maxBookPageSize; double multiplier = Math.max(0.3D, Math.min(1D, com.destroystokyo.paper.PaperConfig.maxBookTotalSizeMultiplier)); long byteAllowed = maxBookPageSize; @@ -21,7 +21,7 @@ index c0889697ed81298b66e418d53abd7598e1a6dc3f..d68de70beb0634004224fe082566f334 server.scheduleOnMain(() -> this.disconnect("Book too large!", org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION)); // Paper - kick event cause return; } -@@ -1180,6 +1182,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -1189,6 +1191,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser 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/0142-Dont-run-with-scissors.patch b/patches/server/0142-Dont-run-with-scissors.patch index 8f0f20b04..db54ce32e 100644 --- a/patches/server/0142-Dont-run-with-scissors.patch +++ b/patches/server/0142-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 d68de70beb0634004224fe082566f33484924b97..7837ee997457e0e6f9c8ef0d0635c04b0c19bf6a 100644 +index 8620dbcdc25be8f94535181f0297a2c70ae58bda..8b3f97a5d2707cb4470685aa95fbca405d365ad1 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1587,6 +1587,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -1596,6 +1596,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser this.player.resetFallDistance(); } @@ -22,7 +22,7 @@ index d68de70beb0634004224fe082566f33484924b97..7837ee997457e0e6f9c8ef0d0635c04b 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(); -@@ -1620,6 +1627,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -1629,6 +1636,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser } // Paper end - optimise out extra getCubes diff --git a/patches/server/0231-Shift-right-click-to-use-exp-for-mending.patch b/patches/server/0231-Shift-right-click-to-use-exp-for-mending.patch index 250812191..32da99eba 100644 --- a/patches/server/0231-Shift-right-click-to-use-exp-for-mending.patch +++ b/patches/server/0231-Shift-right-click-to-use-exp-for-mending.patch @@ -36,10 +36,10 @@ index c42e6e74075f9513d3b3f2006fb5117743289516..1c4fe18c814a48997f5fd4cf07b796cd + // 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 7837ee997457e0e6f9c8ef0d0635c04b0c19bf6a..2f5dd732860059bbfb084733153cb013ea89668c 100644 +index 8b3f97a5d2707cb4470685aa95fbca405d365ad1..74edfa3738468feacfc7e82b4893a1efc9f3198f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1970,6 +1970,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -1979,6 +1979,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser boolean cancelled; if (movingobjectposition == null || movingobjectposition.getType() != HitResult.Type.BLOCK) { @@ -48,7 +48,7 @@ index 7837ee997457e0e6f9c8ef0d0635c04b0c19bf6a..2f5dd732860059bbfb084733153cb013 cancelled = event.useItemInHand() == Event.Result.DENY; } else { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 01d047ef27f14129e3a56a9a7046649dbe6ca142..27662839ca797f13296bcad00575991be3fa646c 100644 +index 5240abedf1d90471250fac0dad32252ba22f7855..30b988908f249cd370caafaaaca7ff032ec23ed5 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -404,6 +404,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0242-Signs-allow-color-codes.patch b/patches/server/0242-Signs-allow-color-codes.patch index c0ba0566d..435ddc88c 100644 --- a/patches/server/0242-Signs-allow-color-codes.patch +++ b/patches/server/0242-Signs-allow-color-codes.patch @@ -17,10 +17,10 @@ index 43dbd3d233a6f0f9f762fb68e81ad49b9c9e6dab..e217120cdfb35a631b488b784caeba14 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 2f5dd732860059bbfb084733153cb013ea89668c..0575f1bb9377ed8d58742db79efa13b639bab229 100644 +index 74edfa3738468feacfc7e82b4893a1efc9f3198f..bf635517f03d16003f951e80f19253ce99d4097d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -3180,11 +3180,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -3189,11 +3189,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser } // Paper end @@ -70,7 +70,7 @@ index 6371176fba41218a209ea59b4cafe5b2d4a685fd..7666bca74f4f68bb4e902ec2eb7c4895 public CompoundTag getUpdateTag() { return this.saveWithoutMetadata(); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 7b76d4f6ad4425b38f018f5dd1632b4801804013..f701ef5e6e58ce89d94fd0e5f2ae26721b0bd66b 100644 +index 90d31d52f7b2c8933c6703ab6d621b48ef801df0..52d451bec22ad9667ec736715131030df75a022a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -924,8 +924,10 @@ public class PurpurWorldConfig {