diff --git a/patches/api/Add-PhantomPreSpawnEvent.patch b/patches/api/Add-PhantomPreSpawnEvent.patch index 701c2e3d41..91491b3432 100644 --- a/patches/api/Add-PhantomPreSpawnEvent.patch +++ b/patches/api/Add-PhantomPreSpawnEvent.patch @@ -54,7 +54,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * Represents a phantom. */ -@@ -0,0 +0,0 @@ public interface Phantom extends Flying { +@@ -0,0 +0,0 @@ public interface Phantom extends Flying, Enemy { * @param sz The new size of the phantom. */ public void setSize(int sz); diff --git a/patches/api/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch index aea7724d02..5f7fda65e8 100644 --- a/patches/api/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch +++ b/patches/api/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch @@ -38,7 +38,7 @@ diff --git a/src/main/java/org/bukkit/entity/Phantom.java b/src/main/java/org/bu index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/entity/Phantom.java +++ b/src/main/java/org/bukkit/entity/Phantom.java -@@ -0,0 +0,0 @@ public interface Phantom extends Flying { +@@ -0,0 +0,0 @@ public interface Phantom extends Flying, Enemy { */ @Nullable public java.util.UUID getSpawningEntity(); diff --git a/patches/api/Allow-to-change-the-podium-of-the-EnderDragon.patch b/patches/api/Allow-to-change-the-podium-of-the-EnderDragon.patch index 51c0a79ffa..f9c621b998 100644 --- a/patches/api/Allow-to-change-the-podium-of-the-EnderDragon.patch +++ b/patches/api/Allow-to-change-the-podium-of-the-EnderDragon.patch @@ -8,7 +8,7 @@ diff --git a/src/main/java/org/bukkit/entity/EnderDragon.java b/src/main/java/or index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/entity/EnderDragon.java +++ b/src/main/java/org/bukkit/entity/EnderDragon.java -@@ -0,0 +0,0 @@ public interface EnderDragon extends ComplexLivingEntity, Boss, Mob { +@@ -0,0 +0,0 @@ public interface EnderDragon extends ComplexLivingEntity, Boss, Mob, Enemy { * @return this dragon's death animation ticks */ int getDeathAnimationTicks(); diff --git a/patches/api/Fix-issues-with-mob-conversion.patch b/patches/api/Fix-issues-with-mob-conversion.patch index 4d11afe66d..931ea6b877 100644 --- a/patches/api/Fix-issues-with-mob-conversion.patch +++ b/patches/api/Fix-issues-with-mob-conversion.patch @@ -8,7 +8,7 @@ diff --git a/src/main/java/org/bukkit/entity/Hoglin.java b/src/main/java/org/buk index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/entity/Hoglin.java +++ b/src/main/java/org/bukkit/entity/Hoglin.java -@@ -0,0 +0,0 @@ public interface Hoglin extends Animals { +@@ -0,0 +0,0 @@ public interface Hoglin extends Animals, Enemy { public int getConversionTime(); /** diff --git a/patches/api/Fix-upstream-javadocs.patch b/patches/api/Fix-upstream-javadocs.patch index cac6e00b37..03d8c48575 100644 --- a/patches/api/Fix-upstream-javadocs.patch +++ b/patches/api/Fix-upstream-javadocs.patch @@ -170,7 +170,7 @@ diff --git a/src/main/java/org/bukkit/entity/Slime.java b/src/main/java/org/bukk index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/entity/Slime.java +++ b/src/main/java/org/bukkit/entity/Slime.java -@@ -0,0 +0,0 @@ public interface Slime extends Mob { +@@ -0,0 +0,0 @@ public interface Slime extends Mob, Enemy { public int getSize(); /** diff --git a/patches/api/Missing-Entity-Behavior-API.patch b/patches/api/Missing-Entity-Behavior-API.patch index b3eda04405..086f1f07ed 100644 --- a/patches/api/Missing-Entity-Behavior-API.patch +++ b/patches/api/Missing-Entity-Behavior-API.patch @@ -462,7 +462,7 @@ diff --git a/src/main/java/org/bukkit/entity/Ghast.java b/src/main/java/org/bukk index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/entity/Ghast.java +++ b/src/main/java/org/bukkit/entity/Ghast.java -@@ -0,0 +0,0 @@ public interface Ghast extends Flying { +@@ -0,0 +0,0 @@ public interface Ghast extends Flying, Enemy { * @param flag Whether the Ghast is charging */ void setCharging(boolean flag); @@ -686,7 +686,7 @@ diff --git a/src/main/java/org/bukkit/entity/Phantom.java b/src/main/java/org/bu index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/entity/Phantom.java +++ b/src/main/java/org/bukkit/entity/Phantom.java -@@ -0,0 +0,0 @@ public interface Phantom extends Flying { +@@ -0,0 +0,0 @@ public interface Phantom extends Flying, Enemy { * @param shouldBurnInDay True to burn in sunlight */ public void setShouldBurnInDay(boolean shouldBurnInDay); diff --git a/patches/api/Slime-Pathfinder-Events.patch b/patches/api/Slime-Pathfinder-Events.patch index 148206c1fb..ecc4de9b21 100644 --- a/patches/api/Slime-Pathfinder-Events.patch +++ b/patches/api/Slime-Pathfinder-Events.patch @@ -194,7 +194,7 @@ diff --git a/src/main/java/org/bukkit/entity/Slime.java b/src/main/java/org/bukk index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/entity/Slime.java +++ b/src/main/java/org/bukkit/entity/Slime.java -@@ -0,0 +0,0 @@ public interface Slime extends Mob { +@@ -0,0 +0,0 @@ public interface Slime extends Mob, Enemy { * @param sz The new size of the slime. */ public void setSize(int sz); diff --git a/patches/server/Add-PhantomPreSpawnEvent.patch b/patches/server/Add-PhantomPreSpawnEvent.patch index ca7ba15767..22981861f7 100644 --- a/patches/server/Add-PhantomPreSpawnEvent.patch +++ b/patches/server/Add-PhantomPreSpawnEvent.patch @@ -83,7 +83,7 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java -@@ -0,0 +0,0 @@ public class CraftPhantom extends CraftFlying implements Phantom { +@@ -0,0 +0,0 @@ public class CraftPhantom extends CraftFlying implements Phantom, CraftEnemy { public EntityType getType() { return EntityType.PHANTOM; } diff --git a/patches/server/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch index 35ba019bed..3497a939e3 100644 --- a/patches/server/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch +++ b/patches/server/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch @@ -113,7 +113,7 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java -@@ -0,0 +0,0 @@ public class CraftPhantom extends CraftFlying implements Phantom { +@@ -0,0 +0,0 @@ public class CraftPhantom extends CraftFlying implements Phantom, CraftEnemy { public java.util.UUID getSpawningEntity() { return getHandle().getSpawningEntity(); } diff --git a/patches/server/Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/Allow-to-change-the-podium-for-the-EnderDragon.patch index 40bd8b498b..b524cbf4b0 100644 --- a/patches/server/Allow-to-change-the-podium-for-the-EnderDragon.patch +++ b/patches/server/Allow-to-change-the-podium-for-the-EnderDragon.patch @@ -126,7 +126,7 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java b index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java -@@ -0,0 +0,0 @@ public class CraftEnderDragon extends CraftMob implements EnderDragon { +@@ -0,0 +0,0 @@ public class CraftEnderDragon extends CraftMob implements EnderDragon, CraftEnem public int getDeathAnimationTicks() { return this.getHandle().dragonDeathTime; } diff --git a/patches/server/Missing-Entity-Behavior-API.patch b/patches/server/Missing-Entity-Behavior-API.patch index 17b6767ebb..2f53fc3692 100644 --- a/patches/server/Missing-Entity-Behavior-API.patch +++ b/patches/server/Missing-Entity-Behavior-API.patch @@ -702,7 +702,7 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java b/src/m index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java -@@ -0,0 +0,0 @@ public class CraftGhast extends CraftFlying implements Ghast { +@@ -0,0 +0,0 @@ public class CraftGhast extends CraftFlying implements Ghast, CraftEnemy { public void setCharging(boolean flag) { this.getHandle().setCharging(flag); } @@ -904,7 +904,7 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java -@@ -0,0 +0,0 @@ public class CraftPhantom extends CraftFlying implements Phantom { +@@ -0,0 +0,0 @@ public class CraftPhantom extends CraftFlying implements Phantom, CraftEnemy { public void setShouldBurnInDay(boolean shouldBurnInDay) { getHandle().setShouldBurnInDay(shouldBurnInDay); } diff --git a/patches/server/Reorder-bukkit-damage-source-entity-for-explosion-to.patch b/patches/server/Reorder-bukkit-damage-source-entity-for-explosion-to.patch deleted file mode 100644 index 2d440e116f..0000000000 --- a/patches/server/Reorder-bukkit-damage-source-entity-for-explosion-to.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> -Date: Fri, 11 Nov 2022 11:49:40 +0100 -Subject: [PATCH] Reorder bukkit damage source entity for explosion to exclude - enderdragon part - - -diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/world/level/Explosion.java -+++ b/src/main/java/net/minecraft/world/level/Explosion.java -@@ -0,0 +0,0 @@ public class Explosion { - double d13 = (1.0D - d7) * d12; - - // CraftBukkit start -- CraftEventFactory.entityDamage = this.source; -- entity.lastDamageCancelled = false; - - // Special case ender dragon only give knockback if no damage is cancelled - // Thinks to note: -@@ -0,0 +0,0 @@ public class Explosion { - continue; - } - -+ // Paper start - moved from above -+ CraftEventFactory.entityDamage = this.source; -+ entity.lastDamageCancelled = false; -+ // Paper end -+ - if (entity instanceof EnderDragon) { - for (EnderDragonPart entityComplexPart : ((EnderDragon) entity).subEntities) { - if (list.contains(entityComplexPart)) { diff --git a/patches/server/Slime-Pathfinder-Events.patch b/patches/server/Slime-Pathfinder-Events.patch index c9f641aa84..2c5338e88b 100644 --- a/patches/server/Slime-Pathfinder-Events.patch +++ b/patches/server/Slime-Pathfinder-Events.patch @@ -148,7 +148,7 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java b/src/m index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java -@@ -0,0 +0,0 @@ public class CraftSlime extends CraftMob implements Slime { +@@ -0,0 +0,0 @@ public class CraftSlime extends CraftMob implements Slime, CraftEnemy { public EntityType getType() { return EntityType.SLIME; } diff --git a/patches/server/fix-dead-slime-setSize-invincibility.patch b/patches/server/fix-dead-slime-setSize-invincibility.patch index ba340689e1..818b56ff4e 100644 --- a/patches/server/fix-dead-slime-setSize-invincibility.patch +++ b/patches/server/fix-dead-slime-setSize-invincibility.patch @@ -8,7 +8,7 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java b/src/m index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java -@@ -0,0 +0,0 @@ public class CraftSlime extends CraftMob implements Slime { +@@ -0,0 +0,0 @@ public class CraftSlime extends CraftMob implements Slime, CraftEnemy { @Override public void setSize(int size) { diff --git a/work/Bukkit b/work/Bukkit index aef9b6d205..d352d96500 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit aef9b6d2051e45d924d2e2b294fdb700b357bd3c +Subproject commit d352d96500fbd215d06f4561f374faabb1c0b1fd diff --git a/work/CraftBukkit b/work/CraftBukkit index ae8f5fc025..397c5557ca 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit ae8f5fc02595a9a70dab28ad1835c9cd44ddc60d +Subproject commit 397c5557cac66a242573cec11a2966d812b710d2