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)
This commit is contained in:
jmp
2021-02-23 12:37:39 -08:00
parent 18f97a99e2
commit 4602b9b2fc
18 changed files with 25 additions and 25 deletions

View File

@@ -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 {