Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
218294b1 PR-743: Support setting individual Wither head targets

CraftBukkit Changes:
d48f2d1a PR-1047: Support setting individual Wither head targets
518f1bee SPIGOT-6948: Motion from Explosion after Respawn
f3c7a6ac SPIGOT-7019: Add yaw in World#getSpawnLocation
This commit is contained in:
Nassim Jahnke 2022-05-17 11:51:46 +02:00
parent 0116751101
commit 73bd35d076
No known key found for this signature in database
GPG key ID: 6BE3B555EBC5982B
33 changed files with 92 additions and 106 deletions

View file

@ -186,7 +186,7 @@ index ef28e0f57ba593265a3eca4d3f21d0b1b51e8740..f4c1316ae1cadc1a7a7fed16e0e99704
while (objectbidirectionaliterator.hasNext()) {
Entry<ChunkHolder> entry = (Entry) objectbidirectionaliterator.next();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 3c75f2a676c21941d21c3683e8ba4f51d880798b..760149102313626831e3692936c6a984f04d252a 100644
index 05352f89399d7c90ff029984889bddd73c31a7d1..0ebacc6f35591b3f1fc740d484f30c7c2337392a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -161,7 +161,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@ -207,7 +207,7 @@ index 3c75f2a676c21941d21c3683e8ba4f51d880798b..760149102313626831e3692936c6a984
if (chunkHolder.getTickingChunk() != null) {
++ret;
}
@@ -355,7 +355,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -356,7 +356,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public Chunk[] getLoadedChunks() {
@ -227,7 +227,7 @@ index 3c75f2a676c21941d21c3683e8ba4f51d880798b..760149102313626831e3692936c6a984
return chunks.values().stream().map(ChunkHolder::getFullChunkNow).filter(Objects::nonNull).map(net.minecraft.world.level.chunk.LevelChunk::getBukkitChunk).toArray(Chunk[]::new);
}
@@ -431,7 +442,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -432,7 +443,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public boolean refreshChunk(int x, int z) {