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

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

Browse source
This commit is contained in:
Jason 2021-10-04 22:14:11 -05:00 • committed by GitHub
parent 90f717fa5a
commit a3dfe6dca5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
365 changed files with 725 additions and 732 deletions
Download patch file Download diff file Expand all files Collapse all files

8
patches/api/0009-Add-getTPS-method.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] Add getTPS method
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 241d6179347a3eedbab537e6e596f18a1a39cee3..357536ffc82e2adb220a3069fa2e76fa28f215e4 100644
index e8747e52ae2ebac79546a04c19a7945d3d4dabe4..82f1a3e4de427c24262d880009c73acf086c1415 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1622,6 +1622,17 @@ public final class Bukkit {
@@ -1653,6 +1653,17 @@ public final class Bukkit {
return server.getEntity(uuid);
}
@ -27,10 +27,10 @@ index 241d6179347a3eedbab537e6e596f18a1a39cee3..357536ffc82e2adb220a3069fa2e76fa
* Get the advancement specified by this key.
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 6f87dec0e0b1625e1628e8a1a8357ddf03db123c..f3102fdbb4caab2d58a8f5e305ac80fa36d10d8d 100644
index e71fe881872e7be2a39f7a6830be9dc83c78ec8c..9779298ab98859a118690c8dce63f621c8255af2 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1372,6 +1372,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1400,6 +1400,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@Nullable
Entity getEntity(@NotNull UUID uuid);