Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6722)

2021-10-04 22:14:11 -05:00 · 2021-10-04 22:14:11 -05:00 · a3dfe6dca5
commit a3dfe6dca5
parent 90f717fa5a
365 changed files with 725 additions and 732 deletions
--- a/patches/api/0075-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/api/0075-Expose-client-protocol-version-and-virtual-host.patch
@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..7b2af1bd72dfbcf4e962a982940fc49b
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 2301a5c6ada86b63b1c0207a6d89b0da4c167bbb..4dc4811d608e51aea3cd2c26beaebc7c25f4b69b 100644
+index dac2db2d953f1897ad79ea985a391d78d992dd84..146487d04db8a52f489cafa919a7e731671f825d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -35,7 +35,7 @@ import org.jetbrains.annotations.Nullable;