From cbe35089c6df5aeb6db88903668d09b7e5914338 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Tue, 17 May 2022 11:51:46 +0200 Subject: [PATCH] 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 --- patches/api/Missing-Entity-Behavior-API.patch | 9 +++++---- patches/api/RangedEntity-API.patch | 12 +++++------- patches/server/Expose-world-spawn-angle.patch | 13 ------------- patches/server/Missing-Entity-Behavior-API.patch | 4 ++-- patches/server/RangedEntity-API.patch | 4 ++-- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 7 files changed, 16 insertions(+), 30 deletions(-) diff --git a/patches/api/Missing-Entity-Behavior-API.patch b/patches/api/Missing-Entity-Behavior-API.patch index c6c1f4911d..722761b417 100644 --- a/patches/api/Missing-Entity-Behavior-API.patch +++ b/patches/api/Missing-Entity-Behavior-API.patch @@ -638,10 +638,11 @@ diff --git a/src/main/java/org/bukkit/entity/Wither.java b/src/main/java/org/buk index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/entity/Wither.java +++ b/src/main/java/org/bukkit/entity/Wither.java -@@ -0,0 +0,0 @@ import com.destroystokyo.paper.entity.RangedEntity; - * Represents a Wither boss - */ - public interface Wither extends Monster, Boss, RangedEntity { // Paper +@@ -0,0 +0,0 @@ public interface Wither extends Monster, Boss, com.destroystokyo.paper.entity.Ra + LEFT, + RIGHT + } ++ + // Paper start + /** + * @return whether the wither is charged diff --git a/patches/api/RangedEntity-API.patch b/patches/api/RangedEntity-API.patch index 26c021828f..63bdb64fe7 100644 --- a/patches/api/RangedEntity-API.patch +++ b/patches/api/RangedEntity-API.patch @@ -170,14 +170,12 @@ diff --git a/src/main/java/org/bukkit/entity/Wither.java b/src/main/java/org/buk index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/entity/Wither.java +++ b/src/main/java/org/bukkit/entity/Wither.java -@@ -0,0 +0,0 @@ - package org.bukkit.entity; - -+import com.destroystokyo.paper.entity.RangedEntity; -+ +@@ -0,0 +0,0 @@ import org.jetbrains.annotations.Nullable; /** * Represents a Wither boss */ -public interface Wither extends Monster, Boss { -+public interface Wither extends Monster, Boss, RangedEntity { // Paper - } ++public interface Wither extends Monster, Boss, com.destroystokyo.paper.entity.RangedEntity { // Paper + + /** + * {@inheritDoc} diff --git a/patches/server/Expose-world-spawn-angle.patch b/patches/server/Expose-world-spawn-angle.patch index f560934d01..fdb70eeb3f 100644 --- a/patches/server/Expose-world-spawn-angle.patch +++ b/patches/server/Expose-world-spawn-angle.patch @@ -17,16 +17,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } Player respawnPlayer = entityplayer1.getBukkitEntity(); -diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -0,0 +0,0 @@ public class CraftWorld extends CraftRegionAccessor implements World { - @Override - public Location getSpawnLocation() { - BlockPos spawn = this.world.getSharedSpawnPos(); -- return new Location(this, spawn.getX(), spawn.getY(), spawn.getZ()); -+ return new Location(this, spawn.getX(), spawn.getY(), spawn.getZ(), world.levelData.getSpawnAngle(), 0.0F); // Paper - expose world spawn angle - } - - @Override diff --git a/patches/server/Missing-Entity-Behavior-API.patch b/patches/server/Missing-Entity-Behavior-API.patch index dc74b4e396..a8e426d7be 100644 --- a/patches/server/Missing-Entity-Behavior-API.patch +++ b/patches/server/Missing-Entity-Behavior-API.patch @@ -568,8 +568,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java @@ -0,0 +0,0 @@ public class CraftWither extends CraftMonster implements Wither, com.destroystok - public BossBar getBossBar() { - return this.bossBar; + Entity target = this.getHandle().getLevel().getEntity(entityId); + return (target != null) ? (LivingEntity) target.getBukkitEntity() : null; } + + // Paper start diff --git a/patches/server/RangedEntity-API.patch b/patches/server/RangedEntity-API.patch index d4a7f90463..8ad8875b62 100644 --- a/patches/server/RangedEntity-API.patch +++ b/patches/server/RangedEntity-API.patch @@ -151,8 +151,8 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java b/src/ index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java -@@ -0,0 +0,0 @@ import org.bukkit.craftbukkit.boss.CraftBossBar; - import org.bukkit.entity.EntityType; +@@ -0,0 +0,0 @@ import org.bukkit.entity.EntityType; + import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Wither; -public class CraftWither extends CraftMonster implements Wither { diff --git a/work/Bukkit b/work/Bukkit index 312281eade..218294b148 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 312281eade984b060ae27c84b63f48cafbb76fd8 +Subproject commit 218294b1485bdcac543ac2e309307b36ad82461e diff --git a/work/CraftBukkit b/work/CraftBukkit index 2ac7fa7af6..d48f2d1a50 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 2ac7fa7af6c1e1ddb0a61d7761eb66eda96f8207 +Subproject commit d48f2d1a508937908a7fb9169d29f53f1b34ab76