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)
This commit is contained in:
jmp
2021-03-01 19:40:57 -08:00
parent a5fa03865d
commit 34f0e578c6
12 changed files with 17 additions and 17 deletions

View File

@@ -597,7 +597,7 @@ index dee00aac05f1acf050f05d4db557a08dd0f301c8..52c0ab1ce46e1f3233ef746d9bc69935
metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
Map<String, Map<String, Integer>> 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 {