Updated Upstream (Bukkit/CraftBukkit) (#7022)

This commit is contained in:
Jake Potrebic 2021-12-04 23:11:59 -08:00 committed by GitHub
parent a8e5141f2a
commit fd352861b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
69 changed files with 281 additions and 247 deletions

View file

@ -26,10 +26,10 @@ index 32ef3edebe94a2014168b7e438752a80b2687e5f..ab6c58eed6707ab7b0aa3e7549a871ad
// Paper end
buf.writeComponent(this.text);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 5338f255f4f664b4c1b1530ba5fd55e0e24fd5b8..bb6ddb9cd958835ef59b8d6681fa3b9f7089b3e3 100644
index 1ac65af16a835f4c601d044412fc06ab9694eaf5..26ad8287e9ec74da99bdffe5de00f2e71ad571d0 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -256,6 +256,26 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -257,6 +257,26 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
// Paper start