Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
f6f9157b Don't toString block unless actually showing the message
b3f0527a Add Spawn Entity SpawnReason API
ec8d7387 MC-183249: Don't generate Carving Masks BitSet unless needed
2d401d2d Improve BlockPosition hashCode/equals
2572bd01 Fix world unload toLowercase - Fixes #3326
dda9680b Optimize brigadier child sorting performance
a71a4ec2 Fix CraftServer.unloadWorld Leak
This commit is contained in:
William Blake Galbreath
2020-05-09 13:18:38 -05:00
parent 3ce3644645
commit 833bd1cc47
9 changed files with 28 additions and 28 deletions

View File

@@ -1,4 +1,4 @@
From 311e767e57053c7e13ec74b143d4fc4e115a9572 Mon Sep 17 00:00:00 2001
From 2900aaeff3997f68cf9c35a4ad845b87aea0f586 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 d8822c29f..e06c0bb39 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 047d48873..869286b09 100644
index b62cfb9a9..e7605ee9f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2058,6 +2058,7 @@ public final class CraftServer implements Server {
@@ -2063,6 +2063,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {