From 6ee7cbceeba6589886b8401e0ea3ebba95e74782 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 23 Aug 2020 20:39:32 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appears to apply and compile correctly Paper Changes: 5486b3db Fix javadocs failing jenkins builds (#4189) 1330eb5f Brand support --- Paper | 2 +- current-paper | 2 +- patches/api/0009-AFK-API.patch | 4 +-- .../api/0023-Player-invulnerabilities.patch | 4 +-- patches/api/0033-Fix-params-in-javadocs.patch | 32 ------------------- .../server/0001-Tuinity-Server-Changes.patch | 18 +++++------ patches/server/0010-AFK-API.patch | 30 ++++++++--------- .../0024-Player-invulnerabilities.patch | 8 ++--- .../0027-Alternative-Keepalive-Handling.patch | 8 ++--- .../server/0055-Signs-allow-color-codes.patch | 4 +-- .../0100-ALlow-color-codes-in-books.patch | 8 ++--- patches/server/0101-Entity-lifespan.patch | 4 +-- ...s-vanilla-scoreboard-colors-patch-to.patch | 6 ++-- patches/server/0125-Ridables.patch | 4 +-- 14 files changed, 51 insertions(+), 83 deletions(-) delete mode 100644 patches/api/0033-Fix-params-in-javadocs.patch diff --git a/Paper b/Paper index b8372fc0b..5486b3db2 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit b8372fc0b399e9d41d426d25254ee034688bc70c +Subproject commit 5486b3db298a7cf6ce319328578b74f54a029ba9 diff --git a/current-paper b/current-paper index cff9aab37..6c15b3594 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.16.2--1cf6628e5afaef6b499248059bf2babfcd28da51 +1.16.2--2c8123d6b7738541aeb4c722d8b819c5e29fb76a diff --git a/patches/api/0009-AFK-API.patch b/patches/api/0009-AFK-API.patch index e6dc1326f..892a619e3 100644 --- a/patches/api/0009-AFK-API.patch +++ b/patches/api/0009-AFK-API.patch @@ -81,10 +81,10 @@ index 000000000..0c8b3e5e4 + } +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index b584f8b15..9dbfe3614 100644 +index 991f757a8..472194e7e 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1877,4 +1877,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1887,4 +1887,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @Override Spigot spigot(); // Spigot end diff --git a/patches/api/0023-Player-invulnerabilities.patch b/patches/api/0023-Player-invulnerabilities.patch index b60bddf0f..a577fed9b 100644 --- a/patches/api/0023-Player-invulnerabilities.patch +++ b/patches/api/0023-Player-invulnerabilities.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 9dbfe3614..1dfe55402 100644 +index 472194e7e..ca98852f8 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1897,5 +1897,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1907,5 +1907,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * Reset the idle timer back to 0 */ void resetIdleTimer(); diff --git a/patches/api/0033-Fix-params-in-javadocs.patch b/patches/api/0033-Fix-params-in-javadocs.patch deleted file mode 100644 index 8b5bf4e89..000000000 --- a/patches/api/0033-Fix-params-in-javadocs.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Sun, 23 Aug 2020 16:29:01 -0500 -Subject: [PATCH] Fix params in javadocs - - -diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 36bb9d37e..b4e55c173 100644 ---- a/src/main/java/org/bukkit/Bukkit.java -+++ b/src/main/java/org/bukkit/Bukkit.java -@@ -175,7 +175,7 @@ public final class Bukkit { - /** - * Set the maximum amount of players which can login to this server. - * -- * @param the amount of players this server allows -+ * @param maxPlayers the amount of players this server allows - */ - public static void setMaxPlayers(int maxPlayers) { - server.setMaxPlayers(maxPlayers); -diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 5b04a7699..70bcd6c3a 100644 ---- a/src/main/java/org/bukkit/Server.java -+++ b/src/main/java/org/bukkit/Server.java -@@ -148,7 +148,7 @@ public interface Server extends PluginMessageRecipient { - /** - * Set the maximum amount of players which can login to this server. - * -- * @param the amount of players this server allows -+ * @param maxPlayers the amount of players this server allows - */ - public void setMaxPlayers(int maxPlayers); - // Paper end diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch index ab6d8b761..2c213a197 100644 --- a/patches/server/0001-Tuinity-Server-Changes.patch +++ b/patches/server/0001-Tuinity-Server-Changes.patch @@ -4222,10 +4222,10 @@ index 8a069cfcb..66d6c15ab 100644 // Paper end - optimised tracker diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index bc613281d..d32f423c5 100644 +index 250ae81b8..b44038534 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -322,19 +322,24 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -325,19 +325,24 @@ public class PlayerConnection implements PacketListenerPlayIn { if (entity != this.player && entity.getRidingPassenger() == this.player && entity == this.r) { WorldServer worldserver = this.player.getWorldServer(); @@ -4257,7 +4257,7 @@ index bc613281d..d32f423c5 100644 // CraftBukkit start - handle custom speeds and skipped ticks -@@ -363,7 +368,9 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -366,7 +371,9 @@ public class PlayerConnection implements PacketListenerPlayIn { speed *= 2f; // TODO: Get the speed of the vehicle instead of the player // Paper start - Prevent moving into unloaded chunks @@ -4268,7 +4268,7 @@ index bc613281d..d32f423c5 100644 this.networkManager.sendPacket(new PacketPlayOutVehicleMove(entity)); return; } -@@ -969,7 +976,7 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -972,7 +979,7 @@ public class PlayerConnection implements PacketListenerPlayIn { } if (this.teleportPos != null) { @@ -4277,7 +4277,7 @@ index bc613281d..d32f423c5 100644 this.A = this.e; this.a(this.teleportPos.x, this.teleportPos.y, this.teleportPos.z, this.player.yaw, this.player.pitch); } -@@ -993,7 +1000,7 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -996,7 +1003,7 @@ public class PlayerConnection implements PacketListenerPlayIn { double d2 = this.player.locZ(); double d3 = this.player.locY(); double d4 = packetplayinflying.a(this.player.locX());double toX = d4; // Paper - OBFHELPER @@ -4286,7 +4286,7 @@ index bc613281d..d32f423c5 100644 double d6 = packetplayinflying.c(this.player.locZ());double toZ = d6; // Paper - OBFHELPER float f = packetplayinflying.a(this.player.yaw); float f1 = packetplayinflying.b(this.player.pitch); -@@ -1001,7 +1008,12 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -1004,7 +1011,12 @@ public class PlayerConnection implements PacketListenerPlayIn { double d8 = d5 - this.m; double d9 = d6 - this.n; double d10 = this.player.getMot().g(); @@ -4300,7 +4300,7 @@ index bc613281d..d32f423c5 100644 if (this.player.isSleeping()) { if (d11 > 1.0D) { -@@ -1034,7 +1046,7 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -1037,7 +1049,7 @@ public class PlayerConnection implements PacketListenerPlayIn { speed = player.abilities.walkSpeed * 10f; } // Paper start - Prevent moving into unloaded chunks @@ -4309,7 +4309,7 @@ index bc613281d..d32f423c5 100644 this.internalTeleport(this.player.locX(), this.player.locY(), this.player.locZ(), this.player.yaw, this.player.pitch, Collections.emptySet()); return; } -@@ -1090,6 +1102,7 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -1093,6 +1105,7 @@ public class PlayerConnection implements PacketListenerPlayIn { } this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9)); @@ -4317,7 +4317,7 @@ index bc613281d..d32f423c5 100644 this.player.setOnGround(packetplayinflying.b()); // CraftBukkit - SPIGOT-5810, SPIGOT-5835: reset by this.player.move // Paper start - prevent position desync if (this.teleportPos != null) { -@@ -1114,7 +1127,7 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -1117,7 +1130,7 @@ public class PlayerConnection implements PacketListenerPlayIn { } this.player.setLocation(d4, d5, d6, f, f1); diff --git a/patches/server/0010-AFK-API.patch b/patches/server/0010-AFK-API.patch index b3b298bb3..7f73e200f 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/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index ce4ebc96c0..eb62555cb2 100644 +index ce4ebc96c..eb62555cb 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -84,6 +84,15 @@ public abstract class EntityHuman extends EntityLiving { @@ -25,7 +25,7 @@ index ce4ebc96c0..eb62555cb2 100644 super(EntityTypes.PLAYER, world); this.bL = ItemStack.b; diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index a947aabfc8..8638d46229 100644 +index a947aabfc..8638d4622 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1718,8 +1718,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -84,7 +84,7 @@ index a947aabfc8..8638d46229 100644 return this.serverStatisticManager; } diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java -index 882b82d895..90c37e4a8e 100644 +index 882b82d89..90c37e4a8 100644 --- a/src/main/java/net/minecraft/server/IEntityAccess.java +++ b/src/main/java/net/minecraft/server/IEntityAccess.java @@ -149,28 +149,18 @@ public interface IEntityAccess { @@ -129,7 +129,7 @@ index 882b82d895..90c37e4a8e 100644 @Nullable diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java -index 06ce390b64..939535cb22 100644 +index 06ce390b6..939535cb2 100644 --- a/src/main/java/net/minecraft/server/IEntitySelector.java +++ b/src/main/java/net/minecraft/server/IEntitySelector.java @@ -7,6 +7,7 @@ import javax.annotation.Nullable; @@ -149,10 +149,10 @@ index 06ce390b64..939535cb22 100644 // Paper start public static final Predicate affectsSpawning = (entity) -> { diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index d32f423c5e..6c1438f7da 100644 +index b44038534..1fa4f0c9d 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -232,6 +232,12 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -235,6 +235,12 @@ public class PlayerConnection implements PacketListenerPlayIn { } if (this.player.F() > 0L && this.minecraftServer.getIdleTimeout() > 0 && SystemUtils.getMonotonicMillis() - this.player.F() > (long) (this.minecraftServer.getIdleTimeout() * 1000 * 60)) { @@ -165,7 +165,7 @@ index d32f423c5e..6c1438f7da 100644 this.player.resetIdleTimer(); // CraftBukkit - SPIGOT-854 this.disconnect(new ChatMessage("multiplayer.disconnect.idling")); } -@@ -455,6 +461,8 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -458,6 +464,8 @@ public class PlayerConnection implements PacketListenerPlayIn { this.lastYaw = to.getYaw(); this.lastPitch = to.getPitch(); @@ -174,7 +174,7 @@ index d32f423c5e..6c1438f7da 100644 // Skip the first time we do this if (true) { // Spigot - don't skip any move events Location oldTo = to.clone(); -@@ -1123,7 +1131,7 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -1126,7 +1134,7 @@ public class PlayerConnection implements PacketListenerPlayIn { if (!this.player.H() && d11 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.playerInteractManager.isCreative() && this.player.playerInteractManager.getGameMode() != EnumGamemode.SPECTATOR) { // Spigot flag1 = true; @@ -183,7 +183,7 @@ index d32f423c5e..6c1438f7da 100644 } this.player.setLocation(d4, d5, d6, f, f1); -@@ -1162,6 +1170,8 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -1165,6 +1173,8 @@ public class PlayerConnection implements PacketListenerPlayIn { this.lastYaw = to.getYaw(); this.lastPitch = to.getPitch(); @@ -193,7 +193,7 @@ index d32f423c5e..6c1438f7da 100644 if (from.getX() != Double.MAX_VALUE) { Location oldTo = to.clone(); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 1ea026aeb4..e29c8f66c9 100644 +index 14318d046..ebf78f2cc 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -843,7 +843,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -215,7 +215,7 @@ index 1ea026aeb4..e29c8f66c9 100644 } else if (entityplayer.isSleeping()) { ++j; diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 803a7ff92a..d699a91685 100644 +index 803a7ff92..d699a9168 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -1,6 +1,7 @@ @@ -243,7 +243,7 @@ index 803a7ff92a..d699a91685 100644 private static void timingsSettings() { timingsUrl = getString("settings.timings.url", timingsUrl); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 361f7857e4..2578a4677d 100644 +index 361f7857e..2578a4677 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -56,4 +56,15 @@ public class PurpurWorldConfig { @@ -263,10 +263,10 @@ index 361f7857e4..2578a4677d 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 2ac4630dee..6438cca019 100644 +index 32856f744..de4d6fb56 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2148,4 +2148,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2155,4 +2155,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return spigot; } // Spigot end @@ -289,7 +289,7 @@ index 2ac4630dee..6438cca019 100644 + // Purpur end } diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index 37e930e0cb..89dc611cd7 100644 +index 37e930e0c..89dc611cd 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -207,6 +207,7 @@ public class ActivationRange diff --git a/patches/server/0024-Player-invulnerabilities.patch b/patches/server/0024-Player-invulnerabilities.patch index fa8ce6766..317fe2370 100644 --- a/patches/server/0024-Player-invulnerabilities.patch +++ b/patches/server/0024-Player-invulnerabilities.patch @@ -67,10 +67,10 @@ index 8638d4622..71d2a658d 100644 public Scoreboard getScoreboard() { return getBukkitEntity().getScoreboard().getHandle(); diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 6c1438f7d..8fa91b8f5 100644 +index 1fa4f0c9d..95534b0c3 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1572,6 +1572,7 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -1575,6 +1575,7 @@ public class PlayerConnection implements PacketListenerPlayIn { PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer()); // Paper start PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()]; @@ -108,10 +108,10 @@ index 2578a4677..c441fcea9 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 6438cca01..b7f05ac06 100644 +index de4d6fb56..5013c9175 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2164,5 +2164,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2171,5 +2171,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public void resetIdleTimer() { getHandle().resetIdleTimer(); } diff --git a/patches/server/0027-Alternative-Keepalive-Handling.patch b/patches/server/0027-Alternative-Keepalive-Handling.patch index 7ad39f3f2..7fc10df6c 100644 --- a/patches/server/0027-Alternative-Keepalive-Handling.patch +++ b/patches/server/0027-Alternative-Keepalive-Handling.patch @@ -17,10 +17,10 @@ index 8e93f1540..470f92c4f 100644 return this.a; } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 8fa91b8f5..a01b80327 100644 +index 95534b0c3..5ec3679cc 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -75,6 +75,7 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -76,6 +76,7 @@ public class PlayerConnection implements PacketListenerPlayIn { private long lastKeepAlive = SystemUtils.getMonotonicMillis(); private void setLastPing(long lastPing) { this.lastKeepAlive = lastPing;}; private long getLastPing() { return this.lastKeepAlive;}; // Paper - OBFHELPER private boolean awaitingKeepAlive; private void setPendingPing(boolean isPending) { this.awaitingKeepAlive = isPending;}; private boolean isPendingPing() { return this.awaitingKeepAlive;}; // Paper - OBFHELPER private long h; private void setKeepAliveID(long keepAliveID) { this.h = keepAliveID;}; private long getKeepAliveID() {return this.h; }; // Paper - OBFHELPER @@ -28,7 +28,7 @@ index 8fa91b8f5..a01b80327 100644 // CraftBukkit start - multithreaded fields private volatile int chatThrottle; private static final AtomicIntegerFieldUpdater chatSpamField = AtomicIntegerFieldUpdater.newUpdater(PlayerConnection.class, "chatThrottle"); -@@ -201,6 +202,21 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -204,6 +205,21 @@ public class PlayerConnection implements PacketListenerPlayIn { long currentTime = SystemUtils.getMonotonicMillis(); long elapsedTime = currentTime - this.getLastPing(); @@ -50,7 +50,7 @@ index 8fa91b8f5..a01b80327 100644 if (this.isPendingPing()) { if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected PlayerConnection.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getName()); // more info -@@ -2714,6 +2730,16 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -2717,6 +2733,16 @@ public class PlayerConnection implements PacketListenerPlayIn { @Override public void a(PacketPlayInKeepAlive packetplayinkeepalive) { diff --git a/patches/server/0055-Signs-allow-color-codes.patch b/patches/server/0055-Signs-allow-color-codes.patch index ad9c0ddd5..262b7142c 100644 --- a/patches/server/0055-Signs-allow-color-codes.patch +++ b/patches/server/0055-Signs-allow-color-codes.patch @@ -17,10 +17,10 @@ index 71d2a658d..7fad63234 100644 this.playerConnection.sendPacket(new PacketPlayOutOpenSignEditor(tileentitysign.getPosition())); } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index a01b80327..c9798d775 100644 +index 5ec3679cc..8e6192fa6 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -2711,6 +2711,14 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -2714,6 +2714,14 @@ public class PlayerConnection implements PacketListenerPlayIn { } } // Paper end diff --git a/patches/server/0100-ALlow-color-codes-in-books.patch b/patches/server/0100-ALlow-color-codes-in-books.patch index 5e69cf6a4..4ac2846e5 100644 --- a/patches/server/0100-ALlow-color-codes-in-books.patch +++ b/patches/server/0100-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/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index c9798d775..3476e6f5f 100644 +index 8e6192fa6..70a65cbbb 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -933,12 +933,13 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -936,12 +936,13 @@ public class PlayerConnection implements PacketListenerPlayIn { itemstack2.setTag(nbttagcompound.clone()); } @@ -24,7 +24,7 @@ index c9798d775..3476e6f5f 100644 ChatComponentText chatcomponenttext = new ChatComponentText(s); s = IChatBaseComponent.ChatSerializer.a((IChatBaseComponent) chatcomponenttext); -@@ -950,7 +951,14 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -953,7 +954,14 @@ public class PlayerConnection implements PacketListenerPlayIn { } else { // Paper start - dont mutate players current item, set it from the event ItemStack newBook = itemstack1.cloneItemStack(); @@ -40,7 +40,7 @@ index c9798d775..3476e6f5f 100644 this.player.setSlot(enumitemslot, CraftEventFactory.handleEditBookEvent(player, enumitemslot, itemstack1, newBook)); // Paper end } -@@ -960,6 +968,16 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -963,6 +971,16 @@ public class PlayerConnection implements PacketListenerPlayIn { } } diff --git a/patches/server/0101-Entity-lifespan.patch b/patches/server/0101-Entity-lifespan.patch index 0e008f576..0c65a2eb7 100644 --- a/patches/server/0101-Entity-lifespan.patch +++ b/patches/server/0101-Entity-lifespan.patch @@ -92,10 +92,10 @@ index 10735e8bd..7f5095f7e 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 3476e6f5f..c3691ab0c 100644 +index 70a65cbbb..87cd7debf 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -2128,6 +2128,7 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -2131,6 +2131,7 @@ public class PlayerConnection implements PacketListenerPlayIn { boolean triggerLeashUpdate = itemInHand != null && itemInHand.getItem() == Items.LEAD && entity instanceof EntityInsentient; Item origItem = this.player.inventory.getItemInHand() == null ? null : this.player.inventory.getItemInHand().getItem(); PlayerInteractEntityEvent event; diff --git a/patches/server/0111-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch b/patches/server/0111-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch index 6cbf17492..5ff1a0c94 100644 --- a/patches/server/0111-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch +++ b/patches/server/0111-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Duplicate paper's vanilla scoreboard colors patch to sync diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index c3691ab0c..7096e5aab 100644 +index 87cd7debf..7e75cf1d2 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1887,7 +1887,15 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -1890,7 +1890,15 @@ public class PlayerConnection implements PacketListenerPlayIn { return null; } @@ -26,7 +26,7 @@ index c3691ab0c..7096e5aab 100644 PlayerConnection.this.minecraftServer.console.sendMessage(message); if (((LazyPlayerSet) queueEvent.getRecipients()).isLazy()) { for (Object player : PlayerConnection.this.minecraftServer.getPlayerList().players) { -@@ -1920,7 +1928,7 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -1923,7 +1931,7 @@ public class PlayerConnection implements PacketListenerPlayIn { // Paper Start - (Meh) Support for vanilla world scoreboard name coloring String displayName = event.getPlayer().getDisplayName(); if (this.player.getWorld().paperConfig.useVanillaScoreboardColoring) { diff --git a/patches/server/0125-Ridables.patch b/patches/server/0125-Ridables.patch index 8036c53e0..c2fa2c37d 100644 --- a/patches/server/0125-Ridables.patch +++ b/patches/server/0125-Ridables.patch @@ -4864,10 +4864,10 @@ index 0bac6b050..9a17eb606 100644 Entity entity1 = this.getShooter(); // Paper start - Cancel hit for vanished players diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 7096e5aab..507291f2b 100644 +index 7e75cf1d2..0aaa6433f 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -2145,6 +2145,8 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -2148,6 +2148,8 @@ public class PlayerConnection implements PacketListenerPlayIn { } this.server.getPluginManager().callEvent(event);