Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +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/server/0098-Add-tick-times-API.patch
View File

@@ -1,4 +1,4 @@
From 13adbf70a09ba38f64b77b40cb5db808987850c7 Mon Sep 17 00:00:00 2001
From 159989e47b1626c5837b62e1f0e644205ab90ada Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 30 Jan 2020 00:41:24 -0600
Subject: [PATCH] Add tick times API
@@ -10,7 +10,7 @@ Subject: [PATCH] Add tick times API
3 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java b/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java
index 00f79e4336..9fe2550a4c 100644
index 00f79e433..9fe2550a4 100644
--- a/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java
+++ b/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java
@@ -15,7 +15,7 @@ import java.util.Locale;
@@ -36,10 +36,10 @@ index 00f79e4336..9fe2550a4c 100644
- }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 262b82538c..2b78709262 100644
index fb0da17ed..bfc41f998 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2185,5 +2185,20 @@ public final class CraftServer implements Server {
@@ -2201,5 +2201,20 @@ public final class CraftServer implements Server {
public boolean isLagging() {
return getServer().lagging;
}
@@ -61,7 +61,7 @@ index 262b82538c..2b78709262 100644
// Purpur end
}
diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
index 2eed9d0a4a..c29380e1c0 100644
index 2eed9d0a4..c29380e1c 100644
--- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
+++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
@@ -4,6 +4,12 @@ import org.bukkit.ChatColor;