Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@c50fc3a Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7480)
PaperMC/Paper@2a4aef3 Mark ChatRender#render as ApiStatus.Override
PaperMC/Paper@f5b9e07 Add GameEvent tags (#6439)
PaperMC/Paper@b173c3e Use access transformers for player profile API (#7468)
PaperMC/Paper@286bd1b 1.18 misc performance dev branch (#7368)
PaperMC/Paper@5bb4549 Fix entity armor not showing on death animation (#7355)
PaperMC/Paper@7b8e0c3 Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@36a1650 Furnace RecipesUsed API (#7399)
PaperMC/Paper@392acfd Configurable sculk sensor listener range (#6443)
PaperMC/Paper@b757019 Add missing block data mins and maxes (#6790)
PaperMC/Paper@9cab01e [ci skip] Update Gradle wrapper to 7.4
PaperMC/Paper@cdb893b Add mid-tick task execution to block ticking
PaperMC/Paper@854f3d3 Put world into worldlist before initing the world
PaperMC/Paper@db81163 Execute mid tick tasks during tile entity ticking
PaperMC/Paper@501834e Fix custom inventory holders (#6199)
PaperMC/Paper@04a337a Add some missing deprecations to the adventure patch (#7500)
PaperMC/Paper@b6dad9c Fix desync on teleporting entity on first tick (#7183)
PaperMC/Paper@2a55e35 Option to have default CustomSpawners in custom worlds (#7493)
PaperMC/Paper@bfa50ad Custom Potion Mixes (#6744)
PaperMC/Paper@7f65b0b Add DataConverter to StructureCheck, for structure lookups
PaperMC/Paper@30cb7d0 ignore excessive vel for Minecarts (Fixes #7515)
This commit is contained in:
lexikiq
2022-03-01 16:27:37 -05:00
parent e237cc3aa9
commit 9aa2e4da7e
9 changed files with 25 additions and 32 deletions

View File

@@ -64,10 +64,10 @@ index 0000000000000000000000000000000000000000..28c01caa9d6379046f6af6612719b404
+ }
+}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 959ee46cd440af5a4e5db3f6ee8b163db8e40d86..756bc14add024e74ca27dd12240e920610e7d74d 100644
index 8a688583e65cd22e0417f9fd24e51803486d095e..b69e0ab985613eede661153e331f1172676212d9 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3918,6 +3918,36 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -3929,6 +3929,36 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@Nullable
public DragonBattle getEnderDragonBattle();