Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 08:57:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
3dafa6a0 Updated Upstream (CraftBukkit)
77b05b9c Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2020-02-03 04:33:26 -06:00
parent 853bcfb6de
commit 23d7b00d9c
16 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/api/0029-Add-tick-times-API.patch
View File

@@ -1,4 +1,4 @@
From e9c512e9e808d037a5d27906f2ed26439878b8e6 Mon Sep 17 00:00:00 2001
From ba6cb31517bc0cdeb1fb90caf3eb3bbc8d58c617 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 30 Jan 2020 00:41:08 -0600
Subject: [PATCH] Add tick times API
@@ -9,10 +9,10 @@ Subject: [PATCH] Add tick times API
2 files changed, 34 insertions(+)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index f6076e94a..739934632 100644
index 10d0537d0..d49cf61b4 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1620,6 +1620,25 @@ public final class Bukkit {
@@ -1634,6 +1634,25 @@ public final class Bukkit {
public static boolean isLagging() {
return server.isLagging();
}
@@ -39,10 +39,10 @@ index f6076e94a..739934632 100644
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 22f6ac18a..efd7c87f1 100644
index 97a981923..f98c6a046 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1416,5 +1416,20 @@ public interface Server extends PluginMessageRecipient {
@@ -1428,5 +1428,20 @@ public interface Server extends PluginMessageRecipient {
* @return True if lagging
*/
boolean isLagging();