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:
9f5fadcc Remove extraneous space from host info log message
d60a10c9 Make the GUI graph fancier (#2928)
ecfaff52 Revert "Add root/admin user detection (#2432)"
555ca59a Add root/admin user detection (#2432)
This commit is contained in:
William Blake Galbreath
2020-02-20 14:21:00 -06:00
parent 4e5bf94149
commit 3128db0d14
4 changed files with 8 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0049-Add-tick-times-API.patch
View File

@@ -1,27 +1,13 @@
From 798b004067acc01d53ca9e280aaff55c30d65a09 Mon Sep 17 00:00:00 2001
From bf3abc994c3bb517ccdfeab7bb69fb25c39ff5e3 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
---
.../net/minecraft/server/MinecraftServer.java | 2 +-
.../org/bukkit/craftbukkit/CraftServer.java | 17 +++++++++++++++++
.../org/spigotmc/TicksPerSecondCommand.java | 11 +++++++++++
3 files changed, 29 insertions(+), 1 deletion(-)
2 files changed, 28 insertions(+)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index cfe3157f08..7a0deeba70 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -105,7 +105,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
private String motd;
private int G;
private int H;
- public final long[] f = new long[100]; public long[] getTickTimes() { return f; } // Purpur
+ public final long[] f = new long[100]; public long[] getTickTimes() { return f; } // Purpur - OBFHELPER
@Nullable
private KeyPair I;
@Nullable
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index df4fb5947a..206fd848ad 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java