Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
a96d3e89 [Auto] Updated Upstream (CraftBukkit)
This commit is contained in:
William Blake Galbreath
2020-07-01 20:56:22 -05:00
parent 3b4e44ff44
commit eed34befaa
10 changed files with 35 additions and 35 deletions

View File

@@ -1,4 +1,4 @@
From 17c9f3c75b390a40743295f7365d1fd2b7d9920b Mon Sep 17 00:00:00 2001
From fc287d75839f8114bab6c97c2c32c68a5d24411a Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 28 Jul 2019 01:27:37 -0500
Subject: [PATCH] Add 5 second tps average in /tps
@@ -52,10 +52,10 @@ index 5acd2a97c..6c0854623 100644
lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
tickSection = curTime;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index a1130d169..fd87db422 100644
index 44e416501..6939d767b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2167,6 +2167,7 @@ public final class CraftServer implements Server {
@@ -2171,6 +2171,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {