From 34f0e578c6cf6d77bc8482a3f9dccf66e6502e54 Mon Sep 17 00:00:00 2001 From: jmp Date: Mon, 1 Mar 2021 19:40:57 -0800 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: 9907cedec New chat events for better Adventure support (#5289) 06900aef5 Fix username connecting with no texture being overwritten by usercache (#4970) df4c68b66 fix #5279 - clickable links again ff5ff3af4 Print command usage for /paper entity list at more places (#5282) --- Paper | 2 +- patches/api/0001-Tuinity-API-Changes.patch | 2 +- patches/server/0001-Tuinity-Server-Changes.patch | 4 ++-- patches/server/0008-AFK-API.patch | 2 +- patches/server/0016-Player-invulnerabilities.patch | 2 +- patches/server/0019-Alternative-Keepalive-Handling.patch | 4 ++-- patches/server/0045-Signs-allow-color-codes.patch | 4 ++-- patches/server/0083-Allow-color-codes-in-books.patch | 2 +- patches/server/0084-Entity-lifespan.patch | 4 ++-- patches/server/0102-Ridables.patch | 4 ++-- patches/server/0154-PlayerBookTooLargeEvent.patch | 2 +- .../0165-Fix-PlayerEditBookEvent-not-saving-new-book.patch | 2 +- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Paper b/Paper index 5d779a621..9907cedec 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 5d779a62126e22f9264c81be7ae3078eeb65c6ab +Subproject commit 9907cedecbbb1a9b524235efe96d31a0ca03866d diff --git a/patches/api/0001-Tuinity-API-Changes.patch b/patches/api/0001-Tuinity-API-Changes.patch index d9699772d..e88c06be1 100644 --- 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 af17cd24b44c601f300e3ad5d6c57d810768b5e8..d12192dcdf733c28661a338b1b969fea2356dfd8 100644 +index 763e619dc8645b7bf96329fb1fd70cd526f99ca5..b581cd4ed360f9d96604a1fd7390ead9a46648fc 100644 --- a/pom.xml +++ b/pom.xml @@ -3,18 +3,18 @@ diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch index 169a0ecd5..93f60c4d7 100644 --- a/patches/server/0001-Tuinity-Server-Changes.patch +++ b/patches/server/0001-Tuinity-Server-Changes.patch @@ -597,7 +597,7 @@ index dee00aac05f1acf050f05d4db557a08dd0f301c8..52c0ab1ce46e1f3233ef746d9bc69935 metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> { Map> map = new HashMap<>(); diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index fa385aac361fb73fd974a8a13dc9bc86e2707451..6112027394647f954b5803fd90afb5995ff955e5 100644 +index dcbee6ebfac34f793c18f21e07187ae7dcb37695..c891f7c247c81a865720237f316f352b2289c724 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -186,6 +186,44 @@ public class PaperCommand extends Command { @@ -13756,7 +13756,7 @@ index 49008cdec739b19409fdaf1b0ed806a6c0e93200..61570ab947b5a153a4c2bcb5a09344f0 } // 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 ad33505bb7896dce6c4381b4652316ef734e9e48..9bd88a7a42ede0029b79eae51a4b7acf1db3fc97 100644 +index d77070eaa8fcecf2c142438c5219574c6b4e68cf..891a5bd192389ce80e77b9b5c53029860c86bc8b 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -423,7 +423,9 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/patches/server/0008-AFK-API.patch b/patches/server/0008-AFK-API.patch index da285d0b4..d894cfad9 100644 --- a/patches/server/0008-AFK-API.patch +++ b/patches/server/0008-AFK-API.patch @@ -149,7 +149,7 @@ index b5e1a860a2569d7668330827614d221b60f3fc78..5f85a1d513f4fdc21b64e1a2b6882e33 // 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 9bd88a7a42ede0029b79eae51a4b7acf1db3fc97..7034f2d09b7e9911cba7834832a901389e6690dc 100644 +index 891a5bd192389ce80e77b9b5c53029860c86bc8b..e1e6f88f94c86fb4254676bc6a26b8a03a4d668e 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -252,6 +252,12 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/patches/server/0016-Player-invulnerabilities.patch b/patches/server/0016-Player-invulnerabilities.patch index 21d56c858..4865fd443 100644 --- a/patches/server/0016-Player-invulnerabilities.patch +++ b/patches/server/0016-Player-invulnerabilities.patch @@ -67,7 +67,7 @@ index a4e266955ada46db08b1815e549fa4bde9606df2..599d7fbc4db928a9825e154c09c9a74d 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 7034f2d09b7e9911cba7834832a901389e6690dc..371285e86ef6d848c2a1c5eb1ce4bc2428405ccd 100644 +index e1e6f88f94c86fb4254676bc6a26b8a03a4d668e..0cde6d65d67ec599e83d3a6dc5a6708eb67fc9ac 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1737,6 +1737,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/patches/server/0019-Alternative-Keepalive-Handling.patch b/patches/server/0019-Alternative-Keepalive-Handling.patch index 6879ef833..2d476aeb1 100644 --- a/patches/server/0019-Alternative-Keepalive-Handling.patch +++ b/patches/server/0019-Alternative-Keepalive-Handling.patch @@ -17,7 +17,7 @@ index 8e93f1540ba5f995489c1fbcec70d10b011cd9c3..470f92c4fb0919d052b19acff8dff533 return this.a; } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 371285e86ef6d848c2a1c5eb1ce4bc2428405ccd..82ac1971278c98d1d09e18b8e0abaacc358efcac 100644 +index 0cde6d65d67ec599e83d3a6dc5a6708eb67fc9ac..41d7c78e93e1b60c6fbef1da6329012724389633 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -86,6 +86,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -50,7 +50,7 @@ index 371285e86ef6d848c2a1c5eb1ce4bc2428405ccd..82ac1971278c98d1d09e18b8e0abaacc 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 -@@ -2913,6 +2929,16 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -2908,6 +2924,16 @@ public class PlayerConnection implements PacketListenerPlayIn { @Override public void a(PacketPlayInKeepAlive packetplayinkeepalive) { diff --git a/patches/server/0045-Signs-allow-color-codes.patch b/patches/server/0045-Signs-allow-color-codes.patch index 55e4cb2f3..4fb372884 100644 --- a/patches/server/0045-Signs-allow-color-codes.patch +++ b/patches/server/0045-Signs-allow-color-codes.patch @@ -17,10 +17,10 @@ index 599d7fbc4db928a9825e154c09c9a74d39a39a03..8bfff671ed779991b8ef5433cfec61b4 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 82ac1971278c98d1d09e18b8e0abaacc358efcac..0054c4ec899146e5bb8cebebba2db2a0efc35323 100644 +index 41d7c78e93e1b60c6fbef1da6329012724389633..fd0c49173c0ae6324489f8152117c95aec8d43e8 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -2907,6 +2907,15 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -2902,6 +2902,15 @@ public class PlayerConnection implements PacketListenerPlayIn { } } // Paper end diff --git a/patches/server/0083-Allow-color-codes-in-books.patch b/patches/server/0083-Allow-color-codes-in-books.patch index 9fa94dca2..9d89c0b19 100644 --- a/patches/server/0083-Allow-color-codes-in-books.patch +++ b/patches/server/0083-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/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 0054c4ec899146e5bb8cebebba2db2a0efc35323..fd3c9904afa5eb6175d308ab046801cee7a21297 100644 +index fd0c49173c0ae6324489f8152117c95aec8d43e8..32fe3cd1197716fb843f947e1a097af523b48266 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1058,7 +1058,8 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/patches/server/0084-Entity-lifespan.patch b/patches/server/0084-Entity-lifespan.patch index 4c10c3017..aa2bf81cd 100644 --- a/patches/server/0084-Entity-lifespan.patch +++ b/patches/server/0084-Entity-lifespan.patch @@ -92,10 +92,10 @@ index 9807441d53fcf4ef7aaffe3801542f5a371eb7af..43cdeaae22bf020d0b3c1e1c56e65e73 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index fd3c9904afa5eb6175d308ab046801cee7a21297..cdcf02a73d3dffecac3605f0c7438075e5bceac3 100644 +index 32fe3cd1197716fb843f947e1a097af523b48266..7bc9cd04a3272179db89340a5a16d35ca8580c99 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -2303,6 +2303,7 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -2298,6 +2298,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/0102-Ridables.patch b/patches/server/0102-Ridables.patch index 15ebac54a..3bf04b3be 100644 --- a/patches/server/0102-Ridables.patch +++ b/patches/server/0102-Ridables.patch @@ -4947,10 +4947,10 @@ index 0000000000000000000000000000000000000000..44929182dfd7ad847d9657c324f440cb + } +} diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index cdcf02a73d3dffecac3605f0c7438075e5bceac3..c926b8b1f1233a3320c7f901162b2b4a098cff8c 100644 +index 7bc9cd04a3272179db89340a5a16d35ca8580c99..23dc7bcdcccce2e3255e40ed5d1711045f7668eb 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -2312,6 +2312,8 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -2307,6 +2307,8 @@ public class PlayerConnection implements PacketListenerPlayIn { } this.server.getPluginManager().callEvent(event); diff --git a/patches/server/0154-PlayerBookTooLargeEvent.patch b/patches/server/0154-PlayerBookTooLargeEvent.patch index 92bb6e075..11119719a 100644 --- a/patches/server/0154-PlayerBookTooLargeEvent.patch +++ b/patches/server/0154-PlayerBookTooLargeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] PlayerBookTooLargeEvent diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index c926b8b1f1233a3320c7f901162b2b4a098cff8c..8162a8e252f12af2d0ecd6c2febc31a5bd619606 100644 +index 23dc7bcdcccce2e3255e40ed5d1711045f7668eb..26f719608cc973f1c2c0fc85b0e35f34a5aa086c 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -970,6 +970,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/patches/server/0165-Fix-PlayerEditBookEvent-not-saving-new-book.patch b/patches/server/0165-Fix-PlayerEditBookEvent-not-saving-new-book.patch index 65f633fc7..84ecb09be 100644 --- a/patches/server/0165-Fix-PlayerEditBookEvent-not-saving-new-book.patch +++ b/patches/server/0165-Fix-PlayerEditBookEvent-not-saving-new-book.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix PlayerEditBookEvent not saving new book diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 8162a8e252f12af2d0ecd6c2febc31a5bd619606..7137759447e65c96abfe3b5ef181b8ce33294df4 100644 +index 26f719608cc973f1c2c0fc85b0e35f34a5aa086c..54615632b49097587f20b9bb7454ec2e2e371994 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1065,7 +1065,7 @@ public class PlayerConnection implements PacketListenerPlayIn {