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

Update upstream B/CB

Browse source
This commit is contained in:
Zach Brown 2016-11-21 15:51:27 -06:00
parent eb877d8cdb
commit 97e0eac6e7
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
21 changed files with 79 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Spigot-API-Patches/0005-Add-getTPS-method.patch
View file

@ -1,14 +1,14 @@
From 10486c5a17f63eecf703a772acd168b74c0f6d40 Mon Sep 17 00:00:00 2001
From 4af32b49e181ea1b8eff460f6d5906e3415d0a4b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 17:24:57 -0600
Subject: [PATCH] Add getTPS method
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index ac8b0f5..86102a6 100644
index 07530ff..ed646ca 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1121,6 +1121,14 @@ public final class Bukkit {
@@ -1133,6 +1133,14 @@ public final class Bukkit {
}
/**
@ -24,10 +24,10 @@ index ac8b0f5..86102a6 100644
* @return the unsafe values instance
*/
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 3cc741b..1e65835 100644
index 36d0be2..09f921a 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -917,6 +917,13 @@ public interface Server extends PluginMessageRecipient {
@@ -927,6 +927,13 @@ public interface Server extends PluginMessageRecipient {
BossBar createBossBar(String title, BarColor color, BarStyle style, BarFlag ...flags);
/**