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

@ -144,10 +144,10 @@ index f1dfb56d0158d36b583b5ee5596235540b2cb11c..b86ceda8f7376334987955095234bdec
this.startMetricsRecordingTick();
this.profiler.push("tick");
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 50ed646021808e23876735d50c727a0f300f596e..3fdfa7750436f78ce6f0c5bac68ee0e602e8ec67 100644
index 10f5be8b1319d371eab0c3153b5f605b033d5208..ae2bad0ba336aa5f3c6d71a04a3ac8a15b311600 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2341,6 +2341,17 @@ public final class CraftServer implements Server {
@@ -2362,6 +2362,17 @@ public final class CraftServer implements Server {
return CraftMagicNumbers.INSTANCE;
}