Updated Upstream (CraftBukkit) (#7105)

This commit is contained in:
Jake Potrebic 2021-12-12 19:59:43 -08:00 committed by GitHub
parent 91f3edaac4
commit c1bd3cc8fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 56 additions and 68 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 cfdc78fe0820d47d8af055e844b08ea003d74368..528687b7672ebf6e25fc0fc120fffe158e543bb3 100644
index 50ed646021808e23876735d50c727a0f300f596e..3fdfa7750436f78ce6f0c5bac68ee0e602e8ec67 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2347,6 +2347,17 @@ public final class CraftServer implements Server {
@@ -2341,6 +2341,17 @@ public final class CraftServer implements Server {
return CraftMagicNumbers.INSTANCE;
}