diff options
| author | Aikar <[email protected]> | 2020-07-22 04:26:59 -0400 |
|---|---|---|
| committer | Aikar <[email protected]> | 2020-07-22 04:26:59 -0400 |
| commit | 2712c688856c79a6acbd2fb2c414d22127ac71d9 (patch) | |
| tree | 39466af961fb4a7849aa9b7a0b4ddf1d2034cf14 /Spigot-API-Patches/0192-Add-tick-times-API.patch | |
| parent | 0901ffd046156b8dfdc97a797ae4c8cf0cce0449 (diff) | |
| download | Paper-2712c688856c79a6acbd2fb2c414d22127ac71d9.tar.gz Paper-2712c688856c79a6acbd2fb2c414d22127ac71d9.zip | |
[Auto] Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
f1e73b03 #525: Add contributors plugin.yml field.
ef0999fe #529: Added getRecipe() method to retrieve a Recipe by it's NamespacedKey
CraftBukkit Changes:
8b831a965 #714: Added getRecipe() method to retrieve a Recipe by it's NamespacedKey
Diffstat (limited to 'Spigot-API-Patches/0192-Add-tick-times-API.patch')
| -rw-r--r-- | Spigot-API-Patches/0192-Add-tick-times-API.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Spigot-API-Patches/0192-Add-tick-times-API.patch b/Spigot-API-Patches/0192-Add-tick-times-API.patch index 4f61829ae9..92fa5fb431 100644 --- a/Spigot-API-Patches/0192-Add-tick-times-API.patch +++ b/Spigot-API-Patches/0192-Add-tick-times-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add tick times API diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 6a0fee5e81e4d97b624af2718595b63e4d7a95b2..eb2fb4cdc4e7585017acfce0198bb0746d2255cc 100644 +index 018a8c871f3afdd8b6e1b156b2113f62e330e3d3..1b9f18b3a48e5f31b1cecbf7ab40c86fef4f44bd 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1444,6 +1444,25 @@ public final class Bukkit { +@@ -1455,6 +1455,25 @@ public final class Bukkit { public static double[] getTPS() { return server.getTPS(); } @@ -35,10 +35,10 @@ index 6a0fee5e81e4d97b624af2718595b63e4d7a95b2..eb2fb4cdc4e7585017acfce0198bb074 /** diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index ea6c86c8979ea6253b00c99b4f9cfcd1621beff0..8cb38856d85e9239a132234fdc6af88f3adfe5b7 100644 +index 93337d6eaf27999043ae09e7240689e7c4e78ace..a07c848039e8a36e07d5362bda499f113bb61f1e 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1216,6 +1216,21 @@ public interface Server extends PluginMessageRecipient { +@@ -1225,6 +1225,21 @@ public interface Server extends PluginMessageRecipient { */ @NotNull public double[] getTPS(); |