mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (CraftBukkit) (#7105)

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

4
patches/server/0384-Add-tick-times-API-and-mspt-command.patch
View file

@ -146,10 +146,10 @@ index b3d3e023d10fe6bb964fe7a3d1cbb96d6a406283..51b8b23892d9a57c1502a7cd9dbde033
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0287df105ee4a2d415a343e1b54b4dd9e369e5d0..3a741fd48aea32b017b2a14e64c47ef1b0af04c7 100644
index 14102e929bb8c91e50a6ea3175512dfb01ccac27..47f69b5ce833003d70b0c9a46a69b007a62f3dcd 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2423,6 +2423,16 @@ public final class CraftServer implements Server {
@@ -2417,6 +2417,16 @@ public final class CraftServer implements Server {
net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
};
}