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

This commit is contained in:
Noah van der Aa 2021-12-20 23:46:51 +01:00 committed by GitHub
parent 6178609e1d
commit ae6fec6d13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
240 changed files with 435 additions and 456 deletions

View file

@ -5,10 +5,10 @@ Subject: [PATCH] Add velocity warnings
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index d30b04375eaed44ae63b3e60ab9ac8a42478a604..41729294bf394a609c25e135b0697e0306f5c098 100644
index 94804f241792bd7067edf0cdbf154ed1533241c3..607f5547d33fd2f8009837fc4a212b5f08a51027 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -287,6 +287,7 @@ public final class CraftServer implements Server {
@@ -288,6 +288,7 @@ public final class CraftServer implements Server {
public boolean ignoreVanillaPermissions = false;
private final List<CraftPlayer> playerView;
public int reloadCount;