Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly Paper Changes: a0093e142 Adventure 4.5.1 afea0e8ab Add links to the Adventure javadocs 846783c8a Fix a couple of typos in the javadoc for Player (#5235) a2574d8f5 Replace usages of LegacyComponentSerializer.legacySection() in Paper-Server with PaperAdventure.LEGACY_SECTION_UXRC (#5233)
2026-02-17 16:37:43 +01:00 · 2021-02-23 12:37:39 -08:00
parent 18f97a99e2
commit 4602b9b2fc
18 changed files with 25 additions and 25 deletions
--- a/2
+++ b/2
--- a/patches/api/0001-Tuinity-API-Changes.patch
+++ b/patches/api/0001-Tuinity-API-Changes.patch
@@ -8,7 +8,7 @@ Tuinity config
 API to retrieve raw YamlConfiguration + timing exports

 diff --git a/pom.xml b/pom.xml
-index 0d922ea17c675d6e3a7106937918d2a818814fba..6c88a9d9f2292e1e65bd631aedbe15e0430d3af4 100644
+index af17cd24b44c601f300e3ad5d6c57d810768b5e8..d12192dcdf733c28661a338b1b969fea2356dfd8 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -3,18 +3,18 @@
--- a/patches/api/0007-AFK-API.patch
+++ b/patches/api/0007-AFK-API.patch
@@ -81,10 +81,10 @@ index 0000000000000000000000000000000000000000..0c8b3e5e4ba412624357ea5662a78862
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 2e78c50de2f01d667a534bfb60ea93209b7f8f8e..5884cd31988c6eab3b56e857db09c96ff54d634c 100644
+index a782286c381907dad341ab4985eb774291f5520f..1679c292d17959740852fc2188c2f21a02bd831e 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2106,4 +2106,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2105,4 +2105,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
     @Override
     Spigot spigot();
     // Spigot end
--- a/patches/api/0016-Player-invulnerabilities.patch
+++ b/patches/api/0016-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 5884cd31988c6eab3b56e857db09c96ff54d634c..d9ea837004d7e8643f93ad241a6dad3192e0afce 100644
+index 1679c292d17959740852fc2188c2f21a02bd831e..91b48898005976e9cf2e8b0bec8e03bc70d16f00 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2126,5 +2126,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2125,5 +2125,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      * Reset the idle timer back to 0
      */
     void resetIdleTimer();
--- a/patches/api/0032-Fix-javadoc-warnings-missing-param-and-return.patch
+++ b/patches/api/0032-Fix-javadoc-warnings-missing-param-and-return.patch
@@ -932,10 +932,10 @@ index a6a7429ed2e1eefb2b12b7480ed74fcc3963a864..e8027e1d505dda6effbb1698550016e8
 
         NORMAL(false),
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d9ea837004d7e8643f93ad241a6dad3192e0afce..86629a708963463badc4ab4796ea1221e8768e8a 100644
+index 91b48898005976e9cf2e8b0bec8e03bc70d16f00..3f6fb8e862f8c7591262d4a6e1e3a95ee18b8f72 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1936,6 +1936,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1935,6 +1935,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
     void resetCooldown();
 
     /**
@@ -944,7 +944,7 @@ index d9ea837004d7e8643f93ad241a6dad3192e0afce..86629a708963463badc4ab4796ea1221
      * @return the client option value of the player
      */
     @NotNull
-@@ -1967,6 +1969,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1966,6 +1968,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
     // Paper end
 
     // Spigot start
--- a/patches/server/0001-Tuinity-Server-Changes.patch
+++ b/patches/server/0001-Tuinity-Server-Changes.patch
@@ -14122,7 +14122,7 @@ index 114e986e5132e5e4bb42d0f08a067429bce53ba6..05656ea8448aa569e8dd480461e2d5f7
             this.player.playerConnection.sendPacket(new PacketPlayOutBlockChange(this.world, blockposition)); // CraftBukkit - SPIGOT-5196
         }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index fefe71f95f94cae9e8d3d3de344155b5cd357fff..8e49de2f89aded40d760d57f4ddfcb84f73deb1d 100644
+index bbaaafbb9b2299a1f67e336d8b94b02cc5ed2c28..ce775d9e3953b57f7b312575483dd9ca763c8bc6 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -100,6 +100,7 @@ public abstract class PlayerList {
@@ -17618,7 +17618,7 @@ index 7511e38130f38703164395a670f12d1af648ff04..e602efcb3fad390bb6bff1055e782bba
                 }
                 value.append("},");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f4263b7a787a3b60d20d63aec3fd42658ca4af38..6c226d46e970fe2ade300fabf0fdd5e9f2679593 100644
+index cd02c294ebbf95bf939a2d19feff0e29bb87edb1..7be915b36121c561cb85f36ab15bed78ffa748ec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -231,7 +231,7 @@ import javax.annotation.Nullable; // Paper
--- a/patches/server/0002-Rebrand.patch
+++ b/patches/server/0002-Rebrand.patch
@@ -182,7 +182,7 @@ index 0000000000000000000000000000000000000000..d8b408f061d96e2fa8e2e587462e2221
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6c226d46e970fe2ade300fabf0fdd5e9f2679593..559bcf739ebe9e96c98e11836e29e4e1cd2e87c4 100644
+index 7be915b36121c561cb85f36ab15bed78ffa748ec..1931c16dfef12717e8c2b4db8f142ed42f90f1f1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -231,7 +231,7 @@ import javax.annotation.Nullable; // Paper
--- a/patches/server/0003-Purpur-config-files.patch
+++ b/patches/server/0003-Purpur-config-files.patch
@@ -373,7 +373,7 @@ index 0000000000000000000000000000000000000000..4904be939c7a4b1d1583fd7b6232c930
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 559bcf739ebe9e96c98e11836e29e4e1cd2e87c4..cb0ab8a9641b1d026d58664b55feaa6239931755 100644
+index 1931c16dfef12717e8c2b4db8f142ed42f90f1f1..6210337825a5aa25036d252ca4663a061f25e980 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -864,6 +864,7 @@ public final class CraftServer implements Server {
--- a/patches/server/0005-Barrels-and-enderchests-6-rows.patch
+++ b/patches/server/0005-Barrels-and-enderchests-6-rows.patch
@@ -143,7 +143,7 @@ index 00eb196f8caa2e4f2478972c14f4596071adbd2a..cb7e34924cb5dbff25d1ffe05cfe5bc2
 +    }
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-index 97c9b528f9ee8eb156a311d68d5d897fb1d837b7..08d35aa86919b97408f05d3669cd68164a3cb64f 100644
+index 9c49d9c21630c48ae6783bfc0f9cbe455862d686..613912e014070382d66d1e3a2e805af1bc741966 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
@@ -212,8 +212,10 @@ public class CraftContainer extends Container {
--- a/patches/server/0008-AFK-API.patch
+++ b/patches/server/0008-AFK-API.patch
@@ -263,7 +263,7 @@ index 361f7857e461578e90cb71e15027dadaf794cb69..2578a4677d1ee060f687be531e696b7c
 +    }
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 66522b820786649a1b82647d8ccdb086edf420f6..3838e2f2430c1e21315cb93b986e428cfde6f591 100644
+index 18a50614a876c0a8ff996e48527a2e89c1078d50..0d990988005a7e7cc3f45715bfd17f109357fe7b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2427,4 +2427,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
--- a/patches/server/0009-Bring-back-server-name.patch
+++ b/patches/server/0009-Bring-back-server-name.patch
@@ -17,7 +17,7 @@ index 65961a03728852bd75367083a0de6fd0082b17cb..780474397acb4d0e7ecb4540e1a2db57
     public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
     public final boolean pvp = this.getBoolean("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cb0ab8a9641b1d026d58664b55feaa6239931755..5b48d7f1b6a42c4d41053cbc1a5f1b3240c71751 100644
+index 6210337825a5aa25036d252ca4663a061f25e980..01ed6d158094bc0d86832af539e1a5e3c0578771 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2509,4 +2509,11 @@ public final class CraftServer implements Server {
--- a/patches/server/0012-Lagging-threshold.patch
+++ b/patches/server/0012-Lagging-threshold.patch
@@ -41,7 +41,7 @@ index 4627261562a1482aecf4034b8717ecccc2dd9eb0..a34ed978596f1a466b0b48e7db92ac4f
     public static boolean enderChestSixRows = false;
     public static boolean enderChestPermissionRows = false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5b48d7f1b6a42c4d41053cbc1a5f1b3240c71751..d1ebee6dd6fe01300a0b661120b1661d18aedb20 100644
+index 01ed6d158094bc0d86832af539e1a5e3c0578771..60af2c2770b5899edfe63d06829edceb5d7d3a71 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2515,5 +2515,10 @@ public final class CraftServer implements Server {
--- a/patches/server/0016-Player-invulnerabilities.patch
+++ b/patches/server/0016-Player-invulnerabilities.patch
@@ -79,7 +79,7 @@ index 7034f2d09b7e9911cba7834832a901389e6690dc..371285e86ef6d848c2a1c5eb1ce4bc24
         this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), packStatus));
         // Paper end
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 8e49de2f89aded40d760d57f4ddfcb84f73deb1d..3416691e1fa95fc94dcc2dccf4722e324e2ff33b 100644
+index ce775d9e3953b57f7b312575483dd9ca763c8bc6..da6f6ada31ef326fa31092a7cf13f0dac5c09a3b 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -918,6 +918,8 @@ public abstract class PlayerList {
@@ -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 3838e2f2430c1e21315cb93b986e428cfde6f591..bae2a248349e07718e3b4668691ed3c65736f4ff 100644
+index 0d990988005a7e7cc3f45715bfd17f109357fe7b..f18faa5bf6eee873c921961578d256c6d625aec5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2443,5 +2443,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
--- a/patches/server/0054-Add-permission-for-F3-N-debug.patch
+++ b/patches/server/0054-Add-permission-for-F3-N-debug.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add permission for F3+N debug


 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 3416691e1fa95fc94dcc2dccf4722e324e2ff33b..7734c06663b77a55b9ee87e72246919ade0fd039 100644
+index da6f6ada31ef326fa31092a7cf13f0dac5c09a3b..779dbe4fd17499799794108336d9729a4fd4d76d 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -1077,6 +1077,7 @@ public abstract class PlayerList {
--- a/patches/server/0073-Add-5-second-tps-average-in-tps.patch
+++ b/patches/server/0073-Add-5-second-tps-average-in-tps.patch
@@ -47,7 +47,7 @@ index b795128c5a69f65883fdd318a8a5b2a65512bb16..1296d06bd7c4abb3a43679e382e83319
                         lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
                         tickSection = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d1ebee6dd6fe01300a0b661120b1661d18aedb20..1f17349c00522cd4768836d78e712cd6c184fd11 100644
+index 60af2c2770b5899edfe63d06829edceb5d7d3a71..999fb1ed13a6d50422738a43f2210287f74c2df4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2295,6 +2295,7 @@ public final class CraftServer implements Server {
--- a/patches/server/0146-Spread-out-and-optimise-player-list-ticks.patch
+++ b/patches/server/0146-Spread-out-and-optimise-player-list-ticks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Spread out and optimise player list ticks


 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 7734c06663b77a55b9ee87e72246919ade0fd039..b0aa5fbb145ed86e96f1a95abab96352c3175c8b 100644
+index 779dbe4fd17499799794108336d9729a4fd4d76d..0a90b84d018f2a6f3f5185b6314ecc4022b98010 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -73,7 +73,7 @@ public abstract class PlayerList {
@@ -56,7 +56,7 @@ index 7734c06663b77a55b9ee87e72246919ade0fd039..b0aa5fbb145ed86e96f1a95abab96352
 
     public void sendAll(Packet<?> packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index bae2a248349e07718e3b4668691ed3c65736f4ff..22cc108b5727c07db31aa0d0b3af4717b92a316b 100644
+index f18faa5bf6eee873c921961578d256c6d625aec5..8b233caf0b799c6f0823bf6e854ce0f13cdc8b43 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1451,7 +1451,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
--- a/patches/server/0152-Implement-TPSBar.patch
+++ b/patches/server/0152-Implement-TPSBar.patch
@@ -37,7 +37,7 @@ index eea187723c1931a5db9a2d79a1abddd664d890a1..33d43478b1bc4b0ca3f16ba80e0cd99b
         this.isRestarting = isRestarting;
         if (flag) {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index b0aa5fbb145ed86e96f1a95abab96352c3175c8b..7b68d74f5b0917cce463c4f1c4e628ac5617da23 100644
+index 0a90b84d018f2a6f3f5185b6314ecc4022b98010..8b70ff57ab54a4ff1544b7a7fee5cc6ad6f20d35 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -517,6 +517,8 @@ public abstract class PlayerList {
--- a/patches/server/0160-Add-EntityTeleportHinderedEvent.patch
+++ b/patches/server/0160-Add-EntityTeleportHinderedEvent.patch
@@ -123,7 +123,7 @@ index a3b810556e306bc2be65c7811cfa7806d5752cfa..f96c41fc8788ee7b674c18cc0fa692df
         }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 22cc108b5727c07db31aa0d0b3af4717b92a316b..945687b295cbf3c26869fede4ff96d3352a96b42 100644
+index 8b233caf0b799c6f0823bf6e854ce0f13cdc8b43..301791a1f49028991713a125a6f0ee02f9a8e575 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -115,6 +115,7 @@ import org.bukkit.entity.EntityType;