From 6bd246b94723c73fe8d109104c7fa242b77c0060 Mon Sep 17 00:00:00 2001 From: Ben Kerllenevich Date: Wed, 19 May 2021 18:01:23 -0400 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: 2c6b1f048 Revert "Remove itneract event from boat" (Fixes #5677) aae1c54a9 Add command line option to load extra plugin jars not in the plugins folder 322886c86 Avoid NPE due to PlayerBedFailEnterEvent d3c9a195c removed duplicate ProjectileHitEvent for fireball (#5671) 7989028a5 More Enchantment API (#5588) c0cb5c129 Adds methods for checking item repairability (#5651) 22399b07f Actually use extended/ambient in BeaconEffectEvent (#5647) 979135878 Add cause and cancel message to PlayerGameModeChangeEvent (#5638) 51e1e58d2 Fix Adventure support in UnknownCommandEvent (#5664) 45e19ffb0 [Auto] Updated Upstream (CraftBukkit) 151457628 Fix Counter#decrement recursive call (#5665) 21ac7dc98 [Auto] Updated Upstream (CraftBukkit) 18ad2c9dd Add environment variable (PAPER_DISABLE_SERVER_GUI) to disable server gui --- Paper | 2 +- .../0019-ItemStack-convenience-methods.patch | 6 ++-- ...oc-warnings-missing-param-and-return.patch | 2 +- ...-Add-unsafe-Entity-serialization-API.patch | 4 +-- .../server/0001-Tuinity-Server-Changes.patch | 28 +++++++++---------- .../server/0002-Airplane-Server-Changes.patch | 8 +++--- patches/server/0003-Rebrand.patch | 8 +++--- patches/server/0004-Purpur-config-files.patch | 12 ++++---- patches/server/0009-AFK-API.patch | 8 +++--- .../server/0010-Bring-back-server-name.patch | 4 +-- .../0011-Configurable-server-mod-name.patch | 2 +- .../0012-LivingEntity-safeFallDistance.patch | 6 ++-- patches/server/0013-Lagging-threshold.patch | 6 ++-- .../0017-Player-invulnerabilities.patch | 14 +++++----- .../0020-Alternative-Keepalive-Handling.patch | 2 +- ...x-vanilla-command-permission-handler.patch | 2 +- .../0025-Disable-outdated-build-check.patch | 4 +-- .../server/0046-Signs-allow-color-codes.patch | 6 ++-- ...-Minecart-settings-and-WASD-controls.patch | 4 +-- ...050-Players-should-not-cram-to-death.patch | 4 +-- ...-Skip-events-if-there-s-no-listeners.patch | 6 ++-- .../0057-Configurable-TPS-Catchup.patch | 2 +- ...0074-Add-5-second-tps-average-in-tps.patch | 6 ++-- patches/server/0077-Add-ping-command.patch | 6 ++-- ...0081-Implement-bed-explosion-options.patch | 4 +-- .../0084-Allow-color-codes-in-books.patch | 2 +- patches/server/0085-Entity-lifespan.patch | 2 +- ...leport-to-spawn-if-outside-world-bor.patch | 4 +-- patches/server/0103-Ridables.patch | 8 +++--- ...0107-LivingEntity-broadcastItemBreak.patch | 4 +-- ...22-Add-tablist-suffix-option-for-afk.patch | 4 +-- ...mes-from-item-forms-of-entities-to-e.patch | 4 +-- patches/server/0134-Add-demo-command.patch | 2 +- .../0138-Add-boat-fall-damage-config.patch | 4 +-- ...d-out-and-optimise-player-list-ticks.patch | 2 +- patches/server/0153-Implement-TPSBar.patch | 4 +-- .../server/0155-PlayerBookTooLargeEvent.patch | 2 +- ...0161-Add-EntityTeleportHinderedEvent.patch | 2 +- .../server/0165-Fix-stuck-in-portals.patch | 4 +-- ...-Add-unsafe-Entity-serialization-API.patch | 2 +- .../server/0173-Dont-run-with-scissors.patch | 2 +- ...-to-ignore-nearby-mobs-when-sleeping.patch | 4 +-- patches/server/0202-Add-credits-command.patch | 2 +- .../0203-Gamemode-extra-permissions.patch | 2 +- 44 files changed, 108 insertions(+), 108 deletions(-) diff --git a/Paper b/Paper index 6ecbe5776..2c6b1f048 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 6ecbe5776516bb535caf4ad685ed41072125d519 +Subproject commit 2c6b1f048dd03e31678293dacf243124dacb1fea diff --git a/patches/api/0019-ItemStack-convenience-methods.patch b/patches/api/0019-ItemStack-convenience-methods.patch index e5f9e1fa6..f724355b8 100644 --- a/patches/api/0019-ItemStack-convenience-methods.patch +++ b/patches/api/0019-ItemStack-convenience-methods.patch @@ -50,7 +50,7 @@ index 9b1c9e60dba9ea3ef8d8e164f13dd76daf57db8e..b04e9de7183f00a9a47c1fce26895c83 + // Purpur end } diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index fccfae41f53a175e1a6a670c793e464456de6b60..54af7fb0b5eaeffc7ec05dd58028bf927f71bb9e 100644 +index 0f8c593ae9bca46081f0b22c2d763a2699175398..ff17e3165beedee235c738ebc8e9c9f1a7ab52ca 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -17,6 +17,18 @@ import org.bukkit.inventory.meta.ItemMeta; @@ -72,8 +72,8 @@ index fccfae41f53a175e1a6a670c793e464456de6b60..54af7fb0b5eaeffc7ec05dd58028bf92 /** * Represents a stack of items. -@@ -874,4 +886,626 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor - return Bukkit.getUnsafe().getItemStackRarity(this); +@@ -896,4 +908,626 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor + return Bukkit.getUnsafe().isValidRepairItemStack(toBeRepaired, this); } // Paper end + diff --git a/patches/api/0033-Fix-javadoc-warnings-missing-param-and-return.patch b/patches/api/0033-Fix-javadoc-warnings-missing-param-and-return.patch index 2a3240f0d..9acc05148 100644 --- a/patches/api/0033-Fix-javadoc-warnings-missing-param-and-return.patch +++ b/patches/api/0033-Fix-javadoc-warnings-missing-param-and-return.patch @@ -534,7 +534,7 @@ index f546e3422539d91f1fcb98c94a722c4b17ef0170..a126581c74da8fae4c86fde2f28a8501 @NotNull diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index 6dbd520182b1e7713a68baad09b7f613424ef619..14244cc7f11035c4da4613bbdf49dac51f0da3cf 100644 +index e504567cf755557be8511f2c93c171572b78e722..d3c4da380e46db0cd7664b568781d03455447700 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -87,6 +87,8 @@ public interface UnsafeValues { diff --git a/patches/api/0038-Add-unsafe-Entity-serialization-API.patch b/patches/api/0038-Add-unsafe-Entity-serialization-API.patch index b52163d44..51ab4ec19 100644 --- a/patches/api/0038-Add-unsafe-Entity-serialization-API.patch +++ b/patches/api/0038-Add-unsafe-Entity-serialization-API.patch @@ -17,10 +17,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index 14244cc7f11035c4da4613bbdf49dac51f0da3cf..7899609b7a3041477d5240deaeee9b80159c2db3 100644 +index d3c4da380e46db0cd7664b568781d03455447700..90e8c2d3f2592505d2fe96b038fae9c96d1d7911 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java -@@ -172,4 +172,28 @@ public interface UnsafeValues { +@@ -182,4 +182,28 @@ public interface UnsafeValues { */ int getProtocolVersion(); // Paper end diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch index c79ccdac4..d3eb1fb0e 100644 --- a/patches/server/0001-Tuinity-Server-Changes.patch +++ b/patches/server/0001-Tuinity-Server-Changes.patch @@ -10935,7 +10935,7 @@ index 1d72af9cace7aa8f1d20c7c1c5be621f533e2dad..b7399d17dd64ca8b1f1fab405cb0ac91 worldData.addProperty("keep-spawn-loaded-range", world.paperConfig.keepLoadedRange); worldData.addProperty("visible-chunk-count", visibleChunks.size()); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 35bb4d0b9ed131e6570cce0b43ae78c5557a0bff..8adbb9a77ff304f14ad3defa0f4f7ec25b0d2a2a 100644 +index d69ddb0236c8553cf63c4a007dfa7b87e8f58299..38547858a415ac36d6c04070d27933a6552b1612 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -268,6 +268,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant public @@ -67,7 +67,7 @@ index 3fdb32f8d8c647e2430fa364e5aaa40de803b025..b336e47b21a0693ebfeae8eb752258a3 public Scoreboard getScoreboard() { return getBukkitEntity().getScoreboard().getHandle(); diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java -index 85964e7fe2cc96ad3b967dadd9ee5d095ee60e2a..937983f27bf11634ccb9044d5dff42e7d77ec9ba 100644 +index e4eb83c5090c00fe405d061fe32b8e176baa264e..129e3083a029bc3f55f2f117fdc5f8faaadcf9c0 100644 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java @@ -1901,6 +1901,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -108,7 +108,7 @@ index 2578a4677d1ee060f687be531e696b7c7be89e84..c441fcea9b2b5a77b801c8a69541cf42 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 36926b8ed2a0304c89296aa743510bb3c415a07e..d7f24ef07d731c83408ceff7bc5da7221d49d5e9 100644 +index 05bd48bb026a71dd420b4d73c58da781828d58e4..14b9e4c845d73946f4151c902e12aa0690b9414c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2510,5 +2510,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0020-Alternative-Keepalive-Handling.patch b/patches/server/0020-Alternative-Keepalive-Handling.patch index 9cd35844d..34cb71a87 100644 --- a/patches/server/0020-Alternative-Keepalive-Handling.patch +++ b/patches/server/0020-Alternative-Keepalive-Handling.patch @@ -17,7 +17,7 @@ index b4c37287362907b8507d156b978ba5b9d961bb7b..9e6e6636539702507abb78515e002819 return this.a; } diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java -index 937983f27bf11634ccb9044d5dff42e7d77ec9ba..1ca7f6cd38bde55bbea762d5ea7e9b73b735c92b 100644 +index 129e3083a029bc3f55f2f117fdc5f8faaadcf9c0..880521dfbf1513eee581c38c839f00b385b6fb33 100644 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java @@ -233,6 +233,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/patches/server/0023-Fix-vanilla-command-permission-handler.patch b/patches/server/0023-Fix-vanilla-command-permission-handler.patch index 6a393adb9..06216b6dc 100644 --- a/patches/server/0023-Fix-vanilla-command-permission-handler.patch +++ b/patches/server/0023-Fix-vanilla-command-permission-handler.patch @@ -17,7 +17,7 @@ index c0fac7369b111e65b896a15848ae22457e5e8914..5278997e522b495b83e53cac5968388d public void removeCommand(String name) { children.remove(name); diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java -index 5702f18cd39c1e7b5614c28a628108e2204b2ec1..b069ee845b2011b2c669b6c75d0a773f52e06e10 100644 +index 56a0665127c7c55049b8438c91e72b6881ed11e0..575bc7d8a433cd6d4755757d82fe3a18da184d5a 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java +++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java @@ -87,6 +87,7 @@ public final class VanillaCommandWrapper extends BukkitCommand { diff --git a/patches/server/0025-Disable-outdated-build-check.patch b/patches/server/0025-Disable-outdated-build-check.patch index 79413c0cd..e9ffedece 100644 --- a/patches/server/0025-Disable-outdated-build-check.patch +++ b/patches/server/0025-Disable-outdated-build-check.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Disable outdated build check diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 7d393684bb7301c619e0135186568135102d5ddb..9ad2fe39dfd9f2b81c4aca4f56763443e514e433 100644 +index 09168bced10094c2058ffe7a10613b83360d998b..51cdc7e87413302a73416a5da724d873efb29657 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -266,7 +266,7 @@ public class Main { +@@ -272,7 +272,7 @@ public class Main { System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper } diff --git a/patches/server/0046-Signs-allow-color-codes.patch b/patches/server/0046-Signs-allow-color-codes.patch index e0a7ddf29..14a68a2b0 100644 --- a/patches/server/0046-Signs-allow-color-codes.patch +++ b/patches/server/0046-Signs-allow-color-codes.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Signs allow color codes diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java -index b336e47b21a0693ebfeae8eb752258a3e2f6d4f4..7128e72f6496768293d305bdecb1f1f3cd2220b0 100644 +index e65a3e3e7bf6a366c30b44e166e2085966ebc933..a8d60d288afd9b413494fe6abe8cfddb7c1f0b3b 100644 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java -@@ -1594,6 +1594,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1603,6 +1603,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @Override public void openSign(TileEntitySign tileentitysign) { @@ -17,7 +17,7 @@ index b336e47b21a0693ebfeae8eb752258a3e2f6d4f4..7128e72f6496768293d305bdecb1f1f3 this.playerConnection.sendPacket(new PacketPlayOutOpenSignEditor(tileentitysign.getPosition())); } diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java -index 1ca7f6cd38bde55bbea762d5ea7e9b73b735c92b..b685d23a4fabd6a09187a26b5a0bdb6b00b5893e 100644 +index 880521dfbf1513eee581c38c839f00b385b6fb33..a48a1e13adfc70ac0887b3a4c3c7f3a1d92a9606 100644 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java @@ -3078,6 +3078,15 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/patches/server/0048-Minecart-settings-and-WASD-controls.patch b/patches/server/0048-Minecart-settings-and-WASD-controls.patch index cee5fa1d2..b03206f16 100644 --- a/patches/server/0048-Minecart-settings-and-WASD-controls.patch +++ b/patches/server/0048-Minecart-settings-and-WASD-controls.patch @@ -22,10 +22,10 @@ index 2685a395a2eff9083cd8c654c4b7e2141b0ca99b..c2706c752f6ff5c131b6db469ae85dd7 super(i, j, k); } diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java -index 7128e72f6496768293d305bdecb1f1f3cd2220b0..ada349499fe4121f4e6ba2cf286d791cf80a1d6f 100644 +index a8d60d288afd9b413494fe6abe8cfddb7c1f0b3b..57900f89695bcce9aa6e90ab96007e456ef0448a 100644 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java -@@ -1133,6 +1133,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1142,6 +1142,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { if (this.isInvulnerable(damagesource)) { return false; } else { diff --git a/patches/server/0050-Players-should-not-cram-to-death.patch b/patches/server/0050-Players-should-not-cram-to-death.patch index 7280e6368..158c4cfa0 100644 --- a/patches/server/0050-Players-should-not-cram-to-death.patch +++ b/patches/server/0050-Players-should-not-cram-to-death.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Players should not cram to death diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java -index ada349499fe4121f4e6ba2cf286d791cf80a1d6f..7376cf0f5e3873747acf5acc7918b4bd54e67095 100644 +index 57900f89695bcce9aa6e90ab96007e456ef0448a..c766ec5ac4519d1c734a10e667988ada040096c5 100644 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java -@@ -1571,7 +1571,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1580,7 +1580,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @Override public boolean isInvulnerable(DamageSource damagesource) { diff --git a/patches/server/0054-Skip-events-if-there-s-no-listeners.patch b/patches/server/0054-Skip-events-if-there-s-no-listeners.patch index 8a72a4f71..df7dfa6e5 100644 --- a/patches/server/0054-Skip-events-if-there-s-no-listeners.patch +++ b/patches/server/0054-Skip-events-if-there-s-no-listeners.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Skip events if there's no listeners diff --git a/src/main/java/net/minecraft/commands/CommandDispatcher.java b/src/main/java/net/minecraft/commands/CommandDispatcher.java -index 29a395e69aab9c50a45c5fd5ab8795fd8e3ef727..5ae31658fb1183eab66f682cc5477bc526c27753 100644 +index 7e30ec9a08d919d2ae9218ee0a11f77719129f07..b1bfc42b4153b225243ba65e7f937c0314cb39a5 100644 --- a/src/main/java/net/minecraft/commands/CommandDispatcher.java +++ b/src/main/java/net/minecraft/commands/CommandDispatcher.java -@@ -367,6 +367,7 @@ public class CommandDispatcher { +@@ -368,6 +368,7 @@ public class CommandDispatcher { } private void runSync(EntityPlayer entityplayer, Collection bukkit, RootCommandNode rootcommandnode) { @@ -16,7 +16,7 @@ index 29a395e69aab9c50a45c5fd5ab8795fd8e3ef727..5ae31658fb1183eab66f682cc5477bc5 // Paper end - Async command map building new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent(entityplayer.getBukkitEntity(), (RootCommandNode) rootcommandnode, false).callEvent(); // Paper PlayerCommandSendEvent event = new PlayerCommandSendEvent(entityplayer.getBukkitEntity(), new LinkedHashSet<>(bukkit)); -@@ -379,6 +380,7 @@ public class CommandDispatcher { +@@ -380,6 +381,7 @@ public class CommandDispatcher { } } // CraftBukkit end diff --git a/patches/server/0057-Configurable-TPS-Catchup.patch b/patches/server/0057-Configurable-TPS-Catchup.patch index e706a155b..5f20376ce 100644 --- a/patches/server/0057-Configurable-TPS-Catchup.patch +++ b/patches/server/0057-Configurable-TPS-Catchup.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable TPS Catchup diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index c8653b1214af3e08aa4f197c0e2923a81ed47ffc..9fbec9f98bd0dd727ef58d7f3f18a8a8ab9910e2 100644 +index 25ce3c3b76efd265fe9fbda2f6e49edde20bea45..11e69678c04017faa66a7527e892c5db73cf235b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1133,7 +1133,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant RequiredArgumentBuilder a(String s, ArgumentType argumenttype) { return RequiredArgumentBuilder.argument(s, argumenttype); } -@@ -446,6 +449,7 @@ public class CommandDispatcher { +@@ -447,6 +450,7 @@ public class CommandDispatcher { }; } diff --git a/patches/server/0081-Implement-bed-explosion-options.patch b/patches/server/0081-Implement-bed-explosion-options.patch index fb4283755..f691001e1 100644 --- a/patches/server/0081-Implement-bed-explosion-options.patch +++ b/patches/server/0081-Implement-bed-explosion-options.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Implement bed explosion options diff --git a/src/main/java/net/minecraft/world/level/block/BlockBed.java b/src/main/java/net/minecraft/world/level/block/BlockBed.java -index abe0a1c309d526de37efcac44922fa259e1d112c..db9ef25d0578538fd7c7950a3b3d03453da336f1 100644 +index 00a01a157deec004bcf2f8587723a0ecd0bfef85..d42a3e73c6e4e65f023fa5af65a26acbf2f01281 100644 --- a/src/main/java/net/minecraft/world/level/block/BlockBed.java +++ b/src/main/java/net/minecraft/world/level/block/BlockBed.java -@@ -137,7 +137,7 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity { +@@ -138,7 +138,7 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity { world.a(blockposition1, false); } diff --git a/patches/server/0084-Allow-color-codes-in-books.patch b/patches/server/0084-Allow-color-codes-in-books.patch index b0b9b3977..7d9de011a 100644 --- a/patches/server/0084-Allow-color-codes-in-books.patch +++ b/patches/server/0084-Allow-color-codes-in-books.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow color codes in books diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java -index b685d23a4fabd6a09187a26b5a0bdb6b00b5893e..6970deaaf638428f1a90d5841b656a59e2f8ee71 100644 +index a48a1e13adfc70ac0887b3a4c3c7f3a1d92a9606..7a68762abd3334d6a5f43b680e5d18ace863ab95 100644 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java @@ -1216,7 +1216,8 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/patches/server/0085-Entity-lifespan.patch b/patches/server/0085-Entity-lifespan.patch index bcacfd26f..fe1bb2f1e 100644 --- a/patches/server/0085-Entity-lifespan.patch +++ b/patches/server/0085-Entity-lifespan.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity lifespan diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java -index 6970deaaf638428f1a90d5841b656a59e2f8ee71..319b7b2b62fc4646591b29e3045f81b2df8a6a7b 100644 +index 7a68762abd3334d6a5f43b680e5d18ace863ab95..fb19b16e452571a4199b5cd152642fc01bb476ed 100644 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java @@ -2463,6 +2463,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/patches/server/0086-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0086-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch index 162ceef78..f51f2c15d 100644 --- a/patches/server/0086-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch +++ b/patches/server/0086-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java -index 7376cf0f5e3873747acf5acc7918b4bd54e67095..69d46439801f8a9ba60337febbb423b65049fd3c 100644 +index c766ec5ac4519d1c734a10e667988ada040096c5..b3d12463fbeb2045860c6b933da74980f778472e 100644 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java -@@ -2571,4 +2571,26 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -2587,4 +2587,26 @@ public class EntityPlayer extends EntityHuman implements ICrafting { return (CraftPlayer) super.getBukkitEntity(); } // CraftBukkit end diff --git a/patches/server/0103-Ridables.patch b/patches/server/0103-Ridables.patch index 0c05cd528..8075925f9 100644 --- a/patches/server/0103-Ridables.patch +++ b/patches/server/0103-Ridables.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ridables diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 0cea9db58772d8c69b5cfdd4a2987593b2c9ea6c..e3c3b2eb03ad132a91140cb459fd8f378154ee2e 100644 +index b268068b5d2bc5f0d032e11ac38bf011a32df01c..ad4e1d5154bebf7458c38bed7380f12d06c3eaaf 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1541,6 +1541,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant packet) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d7f24ef07d731c83408ceff7bc5da7221d49d5e9..4d442f2ec45ba023772887cfdb5e5e9f829b2701 100644 +index 14b9e4c845d73946f4151c902e12aa0690b9414c..e557157c5128ea89d728de2ab92b5e1a7b3437ef 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1442,7 +1442,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0153-Implement-TPSBar.patch b/patches/server/0153-Implement-TPSBar.patch index 03b734275..cbe5fba99 100644 --- a/patches/server/0153-Implement-TPSBar.patch +++ b/patches/server/0153-Implement-TPSBar.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement TPSBar diff --git a/src/main/java/net/minecraft/commands/CommandDispatcher.java b/src/main/java/net/minecraft/commands/CommandDispatcher.java -index 2f5e8ed345ace0d9abb7edebe1fd47e562b1d272..ce95a7d9c967d723bad468bd00a5c0a6b887aa33 100644 +index 0ea56c863a9a1019b36f7f9f9164301aef12637b..4338b459011bf7a083790b7bb76cf1b24471fd19 100644 --- a/src/main/java/net/minecraft/commands/CommandDispatcher.java +++ b/src/main/java/net/minecraft/commands/CommandDispatcher.java @@ -193,6 +193,7 @@ public class CommandDispatcher { @@ -17,7 +17,7 @@ index 2f5e8ed345ace0d9abb7edebe1fd47e562b1d272..ce95a7d9c967d723bad468bd00a5c0a6 if (commanddispatcher_servertype.d) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e3c3b2eb03ad132a91140cb459fd8f378154ee2e..176fc4c8b7c5ef45b29cb8aaa1b1ff16dbfc9b7c 100644 +index ad4e1d5154bebf7458c38bed7380f12d06c3eaaf..f0db6072ebce4b60dcf3b4bea774ddabb3061302 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -990,6 +990,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant