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

Initial work on 1.14 pre-5

Browse source
This commit is contained in:
Shane Freeder 2019-04-23 05:47:07 +01:00
parent fb25dc17c6
commit 6c3f04049d
315 changed files with 1547 additions and 1648 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Spigot-API-Patches/0006-Add-getTPS-method.patch
View file

@ -1,14 +1,14 @@
From 73ffeed771aad1a3dd6af47de0875a4b20900ef7 Mon Sep 17 00:00:00 2001
From f6ba024fcfe38fcdb7c7f5f122e26e3aa3beddba 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 cffa0c65..2ad9a7d7 100644
index d2e47a35..97ec6c53 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1341,6 +1341,17 @@ public final class Bukkit {
@@ -1324,6 +1324,17 @@ public final class Bukkit {
return server.getEntity(uuid);
}
@ -27,10 +27,10 @@ index cffa0c65..2ad9a7d7 100644
* 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 9f7f760a..3ad70b92 100644
index 77d993ad..c94c5d90 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1122,6 +1122,16 @@ public interface Server extends PluginMessageRecipient {
@@ -1107,6 +1107,16 @@ public interface Server extends PluginMessageRecipient {
@Nullable
Entity getEntity(@NotNull UUID uuid);
@ -48,5 +48,5 @@ index 9f7f760a..3ad70b92 100644
* Get the advancement specified by this key.
*
--
2.17.1
2.21.0