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

Update API patches to MC 1.12pre2

Browse source
This commit is contained in:
Zach Brown 2017-05-14 08:46:44 -05:00
parent e4f891c95a
commit 828d600143
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
21 changed files with 135 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,14 +1,14 @@
From 89cb7c72eef5269f43decc17a24bc748f00c8616 Mon Sep 17 00:00:00 2001
From e3a0f7d9dce7c912c7a5b69d89673d404670c712 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 7fd544e..3b16953 100644
index e1898343..4f094f7b 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1142,6 +1142,16 @@ public final class Bukkit {
@@ -1125,6 +1125,16 @@ public final class Bukkit {
return server.getEntity(uuid);
}
@ -23,13 +23,13 @@ index 7fd544e..3b16953 100644
+ // Paper end
+
/**
* @see UnsafeValues
* @return the unsafe values instance
* 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 77cfe56..a4e6894 100644
index 30b99241..a503bb49 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -934,6 +934,15 @@ public interface Server extends PluginMessageRecipient {
@@ -919,6 +919,15 @@ public interface Server extends PluginMessageRecipient {
*/
Entity getEntity(UUID uuid);
@ -43,8 +43,8 @@ index 77cfe56..a4e6894 100644
+ // Paper end
+
/**
* @see UnsafeValues
* @return the unsafe values instance
* Get the advancement specified by this key.
*
--
2.9.3
2.11.0