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

Fix rare NPE in GUI on server startup

Browse Source
This commit is contained in:
William Blake Galbreath
2020-01-31 04:44:43 -06:00
parent 3c5f66ef38
commit 6597fbee34
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 43d0712b7263108fc4ad23fc38acb0450ca764e8 Mon Sep 17 00:00:00 2001
From e9c512e9e808d037a5d27906f2ed26439878b8e6 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,7 +9,7 @@ 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..6b9e8b297 100644
index f6076e94a..739934632 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 {
@@ -33,7 +33,7 @@ index f6076e94a..6b9e8b297 100644
+ * @return Average tick time (in millis)
+ */
+ public static double getAverageTickTime() {
+ return server.getAverageTickTime();
+ return server == null ? 0D : server.getAverageTickTime();
+ }
// Purpur end