Updated Upstream (Bukkit/CraftBukkit) (#7022)

2021-12-04 23:11:59 -08:00 · 2021-12-04 23:11:59 -08:00 · fd352861b0
commit fd352861b0
parent a8e5141f2a
69 changed files with 281 additions and 247 deletions
--- a/patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch
@ -57,10 +57,10 @@ index 0000000000000000000000000000000000000000..7b2af1bd72dfbcf4e962a982940fc49b
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 4771a1537646217ad0836f7d5ed62940339b44c6..a0782b81e787630cb45b38a863f1e98506014735 100644
+index 48b127cafe6fecb1849b176df43cbf26e5a1db79..b621f693379aedc23a90b03e724ba8a2ffeb283e 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -36,7 +36,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -37,7 +37,7 @@ import org.jetbrains.annotations.Nullable;
 /**
  * Represents a player, connected or not
  */