Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@d332623 Avoid potential place where the world map could be modified after its iterator is created (#8315)
PaperMC/Paper@6736f39 Fix mangled patch
PaperMC/Paper@4d52f1d Add method isTickingWorlds to Bukkit (#8316)
PaperMC/Paper@62680d5 Avoid item meta usage for itemstack enchantment getter (#8373)
PaperMC/Paper@b4c025b Fix player desync on dimension change (#8253)
This commit is contained in:
BillyGalbreath
2022-09-24 08:04:00 -05:00
parent 103965b5b4
commit ec75e5964a
28 changed files with 99 additions and 99 deletions

View File

@@ -51,10 +51,10 @@ index c617a8aacbbefb37d53d0e005e822469d29aa642..e1abe61edfaa7b1497b5367310b49146
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 85bac0c88b981d6bfec0e36066779ee8c4ed0583..67bde88d7921248a1dd6f36386a290e7ac1e9ecc 100644
index f3bbfc995366eb710082afe40b4d51533f6016ea..9c9826005a444f9877efe2b01a5ae9bd83578422 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1421,6 +1421,19 @@ public final class CraftServer implements Server {
@@ -1426,6 +1426,19 @@ public final class CraftServer implements Server {
return true;
}