From e50cb1d799dc487a57addd0d186de9ec36a0974f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 29 Sep 2019 21:28:06 -0500
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
bfc807c2 Improve spawn loading and debug output for waiting on a chunk (#2595)
826b4762 Remove debug logging for incremental saves (#2600)
d39916c7 Add more timings to chunk provider tick (#2549)
43ec79a3 Add server oversleep to timings (#2509)
1d2a5915 Check if there are workers before trying to notify them (#2593)
89eb8902 [CI-SKIP] Rebuild patches
27fca92f Drop Optimize-GameRules-to-use-LinkedHashMap (#2594)
e4e80f8a Updated Upstream (Bukkit)
---
 Paper                                                     | 2 +-
 current-paper                                             | 2 +-
 patches/server/0001-Rebrand.patch                         | 6 +++---
 patches/server/0044-Implement-lagging-threshold.patch     | 6 +++---
 patches/server/0048-Add-5-second-tps-average-in-tps.patch | 8 ++++----
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Paper b/Paper
index 936d57ba9..bfc807c27 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit 936d57ba93d1446fc147729e6ee2071ec32d5761
+Subproject commit bfc807c27af524162a56c41bcceb62358f640a80
diff --git a/current-paper b/current-paper
index fa9297aa3..3786fcb8c 100644
--- a/current-paper
+++ b/current-paper
@@ -1 +1 @@
-1.14.4--516f7736d4713a789f0de78449b9ee17ca8ecb01
+1.14.4--43a8d3202192eb81cb77a730c55a7dd7d8dbdda8
diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch
index 762625b71..a94403e55 100644
--- a/patches/server/0001-Rebrand.patch
+++ b/patches/server/0001-Rebrand.patch
@@ -1,4 +1,4 @@
-From b67fd8714bdfb391a5b0c90e7d09e8526dd4e7b3 Mon Sep 17 00:00:00 2001
+From d9b6e8c71036723ae8f148ad610c8196df7ee36c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 4 May 2019 01:02:11 -0500
 Subject: [PATCH] Rebrand
@@ -86,10 +86,10 @@ index cd6e25923..bb227bc0f 100644
          );
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d2c029973..dcb783407 100644
+index 0b0058138..1b6a9623c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1439,7 +1439,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1462,7 +1462,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      public String getServerModName() {
diff --git a/patches/server/0044-Implement-lagging-threshold.patch b/patches/server/0044-Implement-lagging-threshold.patch
index a095dc1dd..ea1a0c787 100644
--- a/patches/server/0044-Implement-lagging-threshold.patch
+++ b/patches/server/0044-Implement-lagging-threshold.patch
@@ -1,4 +1,4 @@
-From 2b5bdf675e9be4b6fc7f120d56d693e1fcfbdb70 Mon Sep 17 00:00:00 2001
+From 976e0f922370ffca7ef3a2403b677561f59a5c18 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 10:07:16 -0500
 Subject: [PATCH] Implement lagging threshold
@@ -10,7 +10,7 @@ Subject: [PATCH] Implement lagging threshold
  3 files changed, 12 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index dcb783407..427c1da00 100644
+index 1b6a9623c..ab596e74e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -175,6 +175,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -21,7 +21,7 @@ index dcb783407..427c1da00 100644
      public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
      // Spigot end
  
-@@ -901,6 +902,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -907,6 +908,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                          recentTps[0] = tps1.getAverage();
                          recentTps[1] = tps5.getAverage();
                          recentTps[2] = tps15.getAverage();
diff --git a/patches/server/0048-Add-5-second-tps-average-in-tps.patch b/patches/server/0048-Add-5-second-tps-average-in-tps.patch
index 349da49d9..7d17053ac 100644
--- a/patches/server/0048-Add-5-second-tps-average-in-tps.patch
+++ b/patches/server/0048-Add-5-second-tps-average-in-tps.patch
@@ -1,4 +1,4 @@
-From ab5c2851dd98c8826b7b05f51c4fcfa0f9202736 Mon Sep 17 00:00:00 2001
+From bb9d55a4c4f8c86ab51da99d8c3c5c2fb0541eb0 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Add 5 second tps average in /tps
  3 files changed, 11 insertions(+), 5 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 427c1da00..55aba2157 100644
+index ab596e74e..093457ed7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -174,7 +174,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -22,7 +22,7 @@ index 427c1da00..55aba2157 100644
      public boolean lagging = false; // Purpur
      public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
      // Spigot end
-@@ -819,6 +819,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -825,6 +825,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      private static final long MAX_CATCHUP_BUFFER = TICK_TIME * TPS * 60L;
      private long lastTick = 0;
      private long catchupTime = 0;
@@ -30,7 +30,7 @@ index 427c1da00..55aba2157 100644
      public final RollingAverage tps1 = new RollingAverage(60);
      public final RollingAverage tps5 = new RollingAverage(60 * 5);
      public final RollingAverage tps15 = new RollingAverage(60 * 15);
-@@ -895,13 +896,17 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -901,13 +902,17 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                      {
                          final long diff = curTime - tickSection;
                          java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);