mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6722)

Browse source
This commit is contained in:
Jason 2021-10-04 22:14:11 -05:00 • committed by GitHub
parent 90f717fa5a
commit a3dfe6dca5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
365 changed files with 725 additions and 732 deletions
Download patch file Download diff file Expand all files Collapse all files

4
patches/server/0260-Asynchronous-chunk-IO-and-loading.patch
View file

@ -3622,10 +3622,10 @@ index e5e138fb23d03eb63e547e74d3e14ec9d96d8107..90f7b06bd2c558be35c4577044fa033e
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 74825cd20ae25bbaa1f69ecb208a1c01c1213083..e43135fc10cb2d024295cbe89daf7127fec4898c 100644
index bccc66266739954ca5d7208d233884f5270e0064..034c2886b4e29be40fa2e5e213a7457d803c0f55 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1786,6 +1786,34 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -1811,6 +1811,34 @@ public class CraftWorld extends CraftRegionAccessor implements World {
public DragonBattle getEnderDragonBattle() {
return (this.getHandle().dragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().dragonFight());
}