Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
4276013833 Updated Upstream (Bukkit/CraftBukkit/Spigot)
5344798579 Clean plugin folder logic in extra-jars patch (Fixes #6347) (#6619)
3f2159e43c Unlimited chunk load rate (#6768)
fc0e6c7e08 Fix off by one for determining server view distance
0a16fb8182 Fix merchant inventories not closing on entity removal (#6544)
c1644521c9 Do not overload I/O threads with chunk data while flush saving
This commit is contained in:
William Blake Galbreath
2021-10-16 12:56:31 -05:00
parent e876536ae9
commit db65efba2b
13 changed files with 45 additions and 45 deletions

View File

@@ -51,10 +51,10 @@ index c5a6d8da56cb62cb96e2c9975abd32a93441859f..1d08c05181f310bc904f71a0d7085396
private int maxStack = MAX_STACK;
public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 1cdc15dc93b64887abbc5e7df1a91fc4705df169..f0dd74a839295f6ac9afddc477759859c45ee0c2 100644
index b5dead20f18087c8ebbd564aa25a17c60c549107..bb9aff9f3067b6249447287f5d9f9c6fe86c88d5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1401,6 +1401,19 @@ public final class CraftServer implements Server {
@@ -1418,6 +1418,19 @@ public final class CraftServer implements Server {
return true;
}