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

2021-05-09 13:50:09 -07:00
parent bb125aaccf
commit 4d8954ef25
11 changed files with 31 additions and 118 deletions
--- a/Spigot-Server-Patches/Adventure.patch
+++ b/Spigot-Server-Patches/Adventure.patch
@@ -2249,8 +2249,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +    // Paper end
     @Override
-     public String getLocale() {
-         return getHandle().locale;
+     public int getPing() {
+         return getHandle().ping;
@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         getInventory().setItemInMainHand(hand);
     }