net.minecraft.world.entity.projectile

2025-08-01 04:32:11 -07:00 · 2024-12-13 17:45:53 -08:00
parent cb5feced53
commit 9ef230aa31
46 changed files with 1729 additions and 2211 deletions
--- a/paper-server/patches/sources/net/minecraft/world/entity/projectile/AbstractArrow.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/projectile/AbstractArrow.java.patch
@@ -0,0 +1,224 @@
+--- a/net/minecraft/world/entity/projectile/AbstractArrow.java
+++ b/net/minecraft/world/entity/projectile/AbstractArrow.java
+@@ -33,6 +_,7 @@
+ import net.minecraft.world.entity.OminousItemSpawner;
+ import net.minecraft.world.entity.SlotAccess;
+ import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.item.ItemEntity;
+ import net.minecraft.world.entity.player.Player;
+ import net.minecraft.world.item.Item;
+ import net.minecraft.world.item.ItemStack;
+@@ -74,6 +_,16 @@
+     @Nullable
+     private ItemStack firedFromWeapon = null;
+ 
+    // Spigot Start
+    @Override
+    public void inactiveTick() {
+        if (this.isInGround()) {
+            this.life += 1;
+        }
+        super.inactiveTick();
+    }
+    // Spigot End
+
+     protected AbstractArrow(EntityType<? extends AbstractArrow> entityType, Level level) {
+         super(entityType, level);
+     }
+@@ -87,7 +_,13 @@
+         ItemStack pickupItemStack,
+         @Nullable ItemStack firedFromWeapon
+     ) {
+        // CraftBukkit start - handle the owner before the rest of things
+        this(entityType, x, y, z, level, pickupItemStack, firedFromWeapon, null);
+    }
+    protected AbstractArrow(EntityType<? extends AbstractArrow> entityType, double x, double y, double z, Level level, ItemStack pickupItemStack, @Nullable ItemStack firedFromWeapon, @Nullable LivingEntity ownerEntity) {
+         this(entityType, level);
+        this.setOwner(ownerEntity);
+        // CraftBukkit end
+         this.pickupItemStack = pickupItemStack.copy();
+         this.setCustomName(pickupItemStack.get(DataComponents.CUSTOM_NAME));
+         Unit unit = pickupItemStack.remove(DataComponents.INTANGIBLE_PROJECTILE);
+@@ -112,8 +_,8 @@
+     protected AbstractArrow(
+         EntityType<? extends AbstractArrow> entityType, LivingEntity owner, Level level, ItemStack pickupItemStack, @Nullable ItemStack firedFromWeapon
+     ) {
+-        this(entityType, owner.getX(), owner.getEyeY() - 0.1F, owner.getZ(), level, pickupItemStack, firedFromWeapon);
+-        this.setOwner(owner);
+        this(entityType, owner.getX(), owner.getEyeY() - 0.1F, owner.getZ(), level, pickupItemStack, firedFromWeapon, owner); // CraftBukkit
+        // this.setOwner(owner); // SPIGOT-7744 - Moved to the above constructor
+     }
+ 
+     public void setSoundEvent(SoundEvent soundEvent) {
+@@ -209,6 +_,7 @@
+                 this.applyEffectsFromBlocks();
+             }
+         } else {
+            if (this.tickCount > 200) this.tickDespawn(); // Paper - tick despawnCounter regardless after 10 seconds
+             this.inGroundTime = 0;
+             Vec3 vec31 = this.position();
+             if (this.isInWater()) {
+@@ -275,12 +_,12 @@
+ 
+             if (entityHitResult == null) {
+                 if (this.isAlive() && hitResult.getType() != HitResult.Type.MISS) {
+-                    this.hitTargetOrDeflectSelf(hitResult);
+                    this.preHitTargetOrDeflectSelf(hitResult); // CraftBukkit - projectile hit event
+                     this.hasImpulse = true;
+                 }
+                 break;
+             } else if (this.isAlive() && !this.noPhysics) {
+-                ProjectileDeflection projectileDeflection = this.hitTargetOrDeflectSelf(entityHitResult);
+                ProjectileDeflection projectileDeflection = this.preHitTargetOrDeflectSelf(entityHitResult); // CraftBukkit - projectile hit event
+                 this.hasImpulse = true;
+                 if (this.getPierceLevel() > 0 && projectileDeflection == ProjectileDeflection.NONE) {
+                     continue;
+@@ -313,6 +_,19 @@
+         }
+     }
+ 
+    // Paper start - Fix cancelling ProjectileHitEvent for piercing arrows
+    @Override
+    public ProjectileDeflection preHitTargetOrDeflectSelf(HitResult hitResult) {
+        if (hitResult instanceof EntityHitResult entityHitResult && this.hitCancelled && this.getPierceLevel() > 0) {
+            if (this.piercingIgnoreEntityIds == null) {
+                this.piercingIgnoreEntityIds = new IntOpenHashSet(5);
+            }
+            this.piercingIgnoreEntityIds.add(entityHitResult.getEntity().getId());
+        }
+        return super.preHitTargetOrDeflectSelf(hitResult);
+    }
+    // Paper end - Fix cancelling ProjectileHitEvent for piercing arrows
+
+     @Override
+     protected double getDefaultGravity() {
+         return 0.05;
+@@ -347,8 +_,8 @@
+ 
+     protected void tickDespawn() {
+         this.life++;
+-        if (this.life >= 1200) {
+-            this.discard();
+        if (this.life >= (this.pickup == Pickup.CREATIVE_ONLY ? this.level().paperConfig().entities.spawning.creativeArrowDespawnRate.value() : (this.pickup == Pickup.DISALLOWED ? this.level().paperConfig().entities.spawning.nonPlayerArrowDespawnRate.value() : ((this instanceof ThrownTrident) ? this.level().spigotConfig.tridentDespawnRate : this.level().spigotConfig.arrowDespawnRate)))) { // Spigot // Paper - Configurable non-player arrow despawn rate; TODO: Extract this to init?
+            this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
+         }
+     }
+ 
+@@ -375,9 +_,9 @@
+     }
+ 
+     @Override
+-    public void push(double x, double y, double z) {
+    public void push(double x, double y, double z, @Nullable Entity pushingEntity) { // Paper - add push source entity param
+         if (!this.isInGround()) {
+-            super.push(x, y, z);
+            super.push(x, y, z, pushingEntity); // Paper - add push source entity param
+         }
+     }
+ 
+@@ -404,7 +_,7 @@
+             }
+ 
+             if (this.piercingIgnoreEntityIds.size() >= this.getPierceLevel() + 1) {
+-                this.discard();
+                this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.HIT); // CraftBukkit - add Bukkit remove cause
+                 return;
+             }
+ 
+@@ -420,10 +_,17 @@
+             livingEntity.setLastHurtMob(entity);
+         }
+ 
+        if (this.isCritArrow()) damageSource = damageSource.critical(); // Paper - add critical damage API
+         boolean flag = entity.getType() == EntityType.ENDERMAN;
+         int remainingFireTicks = entity.getRemainingFireTicks();
+         if (this.isOnFire() && !flag) {
+-            entity.igniteForSeconds(5.0F);
+            // CraftBukkit start
+            org.bukkit.event.entity.EntityCombustByEntityEvent combustEvent = new org.bukkit.event.entity.EntityCombustByEntityEvent(this.getBukkitEntity(), entity.getBukkitEntity(), 5.0F);
+            org.bukkit.Bukkit.getPluginManager().callEvent(combustEvent);
+            if (!combustEvent.isCancelled()) {
+                entity.igniteForSeconds(combustEvent.getDuration(), false);
+            }
+            // CraftBukkit end
+         }
+ 
+         if (entity.hurtOrSimulate(damageSource, ceil)) {
+@@ -461,7 +_,7 @@
+ 
+             this.playSound(this.soundEvent, 1.0F, 1.2F / (this.random.nextFloat() * 0.2F + 0.9F));
+             if (this.getPierceLevel() <= 0) {
+-                this.discard();
+                this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.HIT); // CraftBukkit - add Bukkit remove cause
+             }
+         } else {
+             entity.setRemainingFireTicks(remainingFireTicks);
+@@ -472,7 +_,7 @@
+                     this.spawnAtLocation(serverLevel2, this.getPickupItem(), 0.1F);
+                 }
+ 
+-                this.discard();
+                this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.HIT); // CraftBukkit - add Bukkit remove cause
+             }
+         }
+     }
+@@ -485,7 +_,7 @@
+             double max = Math.max(0.0, 1.0 - entity.getAttributeValue(Attributes.KNOCKBACK_RESISTANCE));
+             Vec3 vec3 = this.getDeltaMovement().multiply(1.0, 0.0, 1.0).normalize().scale(d * 0.6 * max);
+             if (vec3.lengthSqr() > 0.0) {
+-                entity.push(vec3.x, 0.1, vec3.z);
+                entity.push(vec3.x, 0.1, vec3.z, this); // Paper - Add EntityKnockbackByEntityEvent and EntityPushedByEntityAttackEvent
+             }
+         }
+     }
+@@ -597,7 +_,7 @@
+         this.setPierceLevel(compound.getByte("PierceLevel"));
+         if (compound.contains("SoundEvent", 8)) {
+             this.soundEvent = BuiltInRegistries.SOUND_EVENT
+-                .getOptional(ResourceLocation.parse(compound.getString("SoundEvent")))
+                .getOptional(ResourceLocation.tryParse(compound.getString("SoundEvent"))) // Paper - Validate resource location
+                 .orElse(this.getDefaultHitGroundSoundEvent());
+         }
+ 
+@@ -616,7 +_,14 @@
+ 
+     @Override
+     public void setOwner(@Nullable Entity entity) {
+        // Paper start - Fix PickupStatus getting reset
+        this.setOwner(entity, true);
+    }
+
+    public void setOwner(@Nullable Entity entity, boolean resetPickup) {
+        // Paper end - Fix PickupStatus getting reset
+         super.setOwner(entity);
+        if (!resetPickup) return; // Paper - Fix PickupStatus getting reset
+ 
+         this.pickup = switch (entity) {
+             case Player player when this.pickup == AbstractArrow.Pickup.DISALLOWED -> AbstractArrow.Pickup.ALLOWED;
+@@ -628,9 +_,24 @@
+     @Override
+     public void playerTouch(Player entity) {
+         if (!this.level().isClientSide && (this.isInGround() || this.isNoPhysics()) && this.shakeTime <= 0) {
+-            if (this.tryPickup(entity)) {
+            // CraftBukkit start
+            ItemStack itemstack = this.getPickupItem();
+            if (this.pickup == Pickup.ALLOWED && !itemstack.isEmpty() && entity.getInventory().canHold(itemstack) > 0) {
+                ItemEntity item = new ItemEntity(this.level(), this.getX(), this.getY(), this.getZ(), itemstack);
+                org.bukkit.event.player.PlayerPickupArrowEvent event = new org.bukkit.event.player.PlayerPickupArrowEvent((org.bukkit.entity.Player) entity.getBukkitEntity(), new org.bukkit.craftbukkit.entity.CraftItem(this.level().getCraftServer(), item), (org.bukkit.entity.AbstractArrow) this.getBukkitEntity());
+                // event.setCancelled(!entityhuman.canPickUpLoot); TODO
+                this.level().getCraftServer().getPluginManager().callEvent(event);
+
+                if (event.isCancelled()) {
+                    return;
+                }
+                itemstack = item.getItem();
+            }
+
+            if ((this.pickup == AbstractArrow.Pickup.ALLOWED && entity.getInventory().add(itemstack)) || (this.pickup == AbstractArrow.Pickup.CREATIVE_ONLY && entity.getAbilities().instabuild)) {
+                // CraftBukkit end
+                 entity.take(this, 1);
+-                this.discard();
+                this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.PICKUP); // CraftBukkit - add Bukkit remove cause
+             }
+         }
+     }
--- a/paper-server/patches/sources/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java.patch
@@ -0,0 +1,26 @@
+--- a/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java
+++ b/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java
+@@ -19,6 +_,8 @@
+     public static final double INITAL_ACCELERATION_POWER = 0.1;
+     public static final double DEFLECTION_SCALE = 0.5;
+     public double accelerationPower = 0.1;
+    public float bukkitYield = 1; // CraftBukkit
+    public boolean isIncendiary = true; // CraftBukkit
+ 
+     protected AbstractHurtingProjectile(EntityType<? extends AbstractHurtingProjectile> entityType, Level level) {
+         super(entityType, level);
+@@ -83,12 +_,12 @@
+             }
+ 
+             if (hitResultOnMoveVector.getType() != HitResult.Type.MISS && this.isAlive()) {
+-                this.hitTargetOrDeflectSelf(hitResultOnMoveVector);
+                this.preHitTargetOrDeflectSelf(hitResultOnMoveVector);
+             }
+ 
+             this.createParticleTrail();
+         } else {
+-            this.discard();
+            this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
+         }
+     }
+ 
--- a/paper-server/patches/sources/net/minecraft/world/entity/projectile/Arrow.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/projectile/Arrow.java.patch
@@ -0,0 +1,17 @@
+--- a/net/minecraft/world/entity/projectile/Arrow.java
+++ b/net/minecraft/world/entity/projectile/Arrow.java
+@@ -121,12 +_,13 @@
+                         mobEffectInstance.isVisible()
+                     ),
+                     effectSource
+                    , org.bukkit.event.entity.EntityPotionEffectEvent.Cause.ARROW // CraftBukkit
+                 );
+             }
+         }
+ 
+         for (MobEffectInstance mobEffectInstance : potionContents.customEffects()) {
+-            living.addEffect(mobEffectInstance, effectSource);
+            living.addEffect(mobEffectInstance, effectSource, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.ARROW); // CraftBukkit
+         }
+     }
+ 
--- a/paper-server/patches/sources/net/minecraft/world/entity/projectile/DragonFireball.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/projectile/DragonFireball.java.patch
@@ -0,0 +1,16 @@
+--- a/net/minecraft/world/entity/projectile/DragonFireball.java
+++ b/net/minecraft/world/entity/projectile/DragonFireball.java
+@@ -52,9 +_,11 @@
+                     }
+                 }
+ 
+                if (new com.destroystokyo.paper.event.entity.EnderDragonFireballHitEvent((org.bukkit.entity.DragonFireball) this.getBukkitEntity(), entitiesOfClass.stream().map(LivingEntity::getBukkitLivingEntity).collect(java.util.stream.Collectors.toList()), (org.bukkit.entity.AreaEffectCloud) areaEffectCloud.getBukkitEntity()).callEvent()) { // Paper - EnderDragon Events
+                 this.level().levelEvent(2006, this.blockPosition(), this.isSilent() ? -1 : 1);
+-                this.level().addFreshEntity(areaEffectCloud);
+-                this.discard();
+                this.level().addFreshEntity(areaEffectCloud, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.EXPLOSION); // Paper - use correct spawn reason
+                } else areaEffectCloud.discard(null); // Paper - EnderDragon Events
+                this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.HIT); // CraftBukkit - add Bukkit remove cause
+             }
+         }
+     }
--- a/paper-server/patches/sources/net/minecraft/world/entity/projectile/EvokerFangs.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/projectile/EvokerFangs.java.patch
@@ -0,0 +1,20 @@
+--- a/net/minecraft/world/entity/projectile/EvokerFangs.java
+++ b/net/minecraft/world/entity/projectile/EvokerFangs.java
+@@ -109,7 +_,7 @@
+             }
+ 
+             if (--this.lifeTicks < 0) {
+-                this.discard();
+                this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
+             }
+         }
+     }
+@@ -118,7 +_,7 @@
+         LivingEntity owner = this.getOwner();
+         if (target.isAlive() && !target.isInvulnerable() && target != owner) {
+             if (owner == null) {
+-                target.hurt(this.damageSources().magic(), 6.0F);
+                target.hurt(this.damageSources().magic().customEventDamager(this), 6.0F); // CraftBukkit // Paper - fix DamageSource API
+             } else {
+                 if (owner.isAlliedTo(target)) {
+                     return;
--- a/paper-server/patches/sources/net/minecraft/world/entity/projectile/EyeOfEnder.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/projectile/EyeOfEnder.java.patch
@@ -0,0 +1,48 @@
+--- a/net/minecraft/world/entity/projectile/EyeOfEnder.java
+++ b/net/minecraft/world/entity/projectile/EyeOfEnder.java
+@@ -70,6 +_,11 @@
+     }
+ 
+     public void signalTo(BlockPos pos) {
+        // Paper start - Change EnderEye target without changing other things
+        this.signalTo(pos, true);
+    }
+    public void signalTo(BlockPos pos, boolean update) {
+        // Paper end - Change EnderEye target without changing other things
+         double d = pos.getX();
+         int y = pos.getY();
+         double d1 = pos.getZ();
+@@ -86,8 +_,10 @@
+             this.tz = d1;
+         }
+ 
+        if (update) { // Paper - Change EnderEye target without changing other things
+         this.life = 0;
+         this.surviveAfterDeath = this.random.nextInt(5) > 0;
+        } // Paper - Change EnderEye target without changing other things
+     }
+ 
+     @Override
+@@ -161,7 +_,7 @@
+             this.life++;
+             if (this.life > 80 && !this.level().isClientSide) {
+                 this.playSound(SoundEvents.ENDER_EYE_DEATH, 1.0F, 1.0F);
+-                this.discard();
+                this.discard(this.surviveAfterDeath ? org.bukkit.event.entity.EntityRemoveEvent.Cause.DROP : org.bukkit.event.entity.EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
+                 if (this.surviveAfterDeath) {
+                     this.level().addFreshEntity(new ItemEntity(this.level(), this.getX(), this.getY(), this.getZ(), this.getItem()));
+                 } else {
+@@ -181,7 +_,12 @@
+     @Override
+     public void readAdditionalSaveData(CompoundTag compound) {
+         if (compound.contains("Item", 10)) {
+-            this.setItem(ItemStack.parse(this.registryAccess(), compound.getCompound("Item")).orElse(this.getDefaultItem()));
+            // CraftBukkit start - SPIGOT-6103 summon, see also SPIGOT-5474
+            ItemStack itemStack = ItemStack.parse(this.registryAccess(), compound.getCompound("Item")).orElse(this.getDefaultItem());
+            if (!itemStack.isEmpty()) {
+                this.setItem(itemStack);
+            }
+            // CraftBukkit end
+         } else {
+             this.setItem(this.getDefaultItem());
+         }
--- a/paper-server/patches/sources/net/minecraft/world/entity/projectile/Fireball.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/projectile/Fireball.java.patch
@@ -0,0 +1,16 @@
+--- a/net/minecraft/world/entity/projectile/Fireball.java
+++ b/net/minecraft/world/entity/projectile/Fireball.java
+@@ -60,7 +_,12 @@
+     public void readAdditionalSaveData(CompoundTag compound) {
+         super.readAdditionalSaveData(compound);
+         if (compound.contains("Item", 10)) {
+-            this.setItem(ItemStack.parse(this.registryAccess(), compound.getCompound("Item")).orElse(this.getDefaultItem()));
+            // CraftBukkit start - SPIGOT-5474 probably came from bugged earlier versions
+            final ItemStack itemStack = ItemStack.parse(this.registryAccess(), compound.getCompound("Item")).orElse(this.getDefaultItem());
+            if (!itemStack.isEmpty()) {
+                this.setItem(itemStack);
+            }
+            // CraftBukkit end
+         } else {
+             this.setItem(this.getDefaultItem());
+         }
--- a/paper-server/patches/sources/net/minecraft/world/entity/projectile/FireworkRocketEntity.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/projectile/FireworkRocketEntity.java.patch
@@ -0,0 +1,117 @@
+--- a/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
+++ b/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
+@@ -43,6 +_,7 @@
+     public int lifetime;
+     @Nullable
+     public LivingEntity attachedToEntity;
+    @Nullable public java.util.UUID spawningEntity; // Paper
+ 
+     public FireworkRocketEntity(EntityType<? extends FireworkRocketEntity> entityType, Level level) {
+         super(entityType, level);
+@@ -84,6 +_,26 @@
+         this.setOwner(shooter);
+     }
+ 
+    // Spigot Start - copied from tick
+    @Override
+    public void inactiveTick() {
+        this.life += 1;
+
+        if (this.life > this.lifetime) {
+            Level world = this.level();
+
+            if (world instanceof ServerLevel serverLevel) {
+                // CraftBukkit start
+                if (!org.bukkit.craftbukkit.event.CraftEventFactory.callFireworkExplodeEvent(this).isCancelled()) {
+                    this.explode(serverLevel);
+                }
+                // CraftBukkit end
+            }
+        }
+        super.inactiveTick();
+    }
+    // Spigot End
+
+     @Override
+     protected void defineSynchedData(SynchedEntityData.Builder builder) {
+         builder.define(DATA_ID_FIREWORKS_ITEM, getDefaultItem());
+@@ -158,7 +_,7 @@
+         }
+ 
+         if (!this.noPhysics && this.isAlive() && hitResultOnMoveVector.getType() != HitResult.Type.MISS) {
+-            this.hitTargetOrDeflectSelf(hitResultOnMoveVector);
+            this.preHitTargetOrDeflectSelf(hitResultOnMoveVector); // CraftBukkit - projectile hit event
+             this.hasImpulse = true;
+         }
+ 
+@@ -182,7 +_,11 @@
+         }
+ 
+         if (this.life > this.lifetime && this.level() instanceof ServerLevel serverLevel) {
+-            this.explode(serverLevel);
+            // CraftBukkit start
+            if (!org.bukkit.craftbukkit.event.CraftEventFactory.callFireworkExplodeEvent(this).isCancelled()) {
+                this.explode(serverLevel);
+            }
+            // CraftBukkit end
+         }
+     }
+ 
+@@ -190,14 +_,18 @@
+         level.broadcastEntityEvent(this, (byte)17);
+         this.gameEvent(GameEvent.EXPLODE, this.getOwner());
+         this.dealExplosionDamage(level);
+-        this.discard();
+        this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.EXPLODE); // CraftBukkit - add Bukkit remove cause
+     }
+ 
+     @Override
+     protected void onHitEntity(EntityHitResult result) {
+         super.onHitEntity(result);
+         if (this.level() instanceof ServerLevel serverLevel) {
+-            this.explode(serverLevel);
+            // CraftBukkit start
+            if (!org.bukkit.craftbukkit.event.CraftEventFactory.callFireworkExplodeEvent(this).isCancelled()) {
+                this.explode(serverLevel);
+            }
+            // CraftBukkit end
+         }
+     }
+ 
+@@ -206,7 +_,11 @@
+         BlockPos blockPos = new BlockPos(result.getBlockPos());
+         this.level().getBlockState(blockPos).entityInside(this.level(), blockPos, this);
+         if (this.level() instanceof ServerLevel serverLevel && this.hasExplosion()) {
+-            this.explode(serverLevel);
+            // CraftBukkit start
+            if (!org.bukkit.craftbukkit.event.CraftEventFactory.callFireworkExplodeEvent(this).isCancelled()) {
+                this.explode(serverLevel);
+            }
+            // CraftBukkit end
+         }
+ 
+         super.onHitBlock(result);
+@@ -278,6 +_,11 @@
+         compound.putInt("LifeTime", this.lifetime);
+         compound.put("FireworksItem", this.getItem().save(this.registryAccess()));
+         compound.putBoolean("ShotAtAngle", this.entityData.get(DATA_SHOT_AT_ANGLE));
+        // Paper start
+        if (this.spawningEntity != null) {
+            compound.putUUID("SpawningEntity", this.spawningEntity);
+        }
+        // Paper end
+     }
+ 
+     @Override
+@@ -298,6 +_,11 @@
+         if (compound.contains("ShotAtAngle")) {
+             this.entityData.set(DATA_SHOT_AT_ANGLE, compound.getBoolean("ShotAtAngle"));
+         }
+        // Paper start
+        if (compound.hasUUID("SpawningEntity")) {
+            this.spawningEntity = compound.getUUID("SpawningEntity");
+        }
+        // Paper end
+     }
+ 
+     private List<FireworkExplosion> getExplosions() {
--- a/paper-server/patches/sources/net/minecraft/world/entity/projectile/FishingHook.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/projectile/FishingHook.java.patch
@@ -0,0 +1,281 @@
+--- a/net/minecraft/world/entity/projectile/FishingHook.java
+++ b/net/minecraft/world/entity/projectile/FishingHook.java
+@@ -66,10 +_,26 @@
+     private final int luck;
+     private final int lureSpeed;
+ 
+    // CraftBukkit start - Extra variables to enable modification of fishing wait time, values are minecraft defaults
+    public int minWaitTime = 100;
+    public int maxWaitTime = 600;
+    public int minLureTime = 20;
+    public int maxLureTime = 80;
+    public float minLureAngle = 0.0F;
+    public float maxLureAngle = 360.0F;
+    public boolean applyLure = true;
+    public boolean rainInfluenced = true;
+    public boolean skyInfluenced = true;
+    // CraftBukkit end
+
+     private FishingHook(EntityType<? extends FishingHook> entityType, Level level, int luck, int lureSpeed) {
+         super(entityType, level);
+         this.luck = Math.max(0, luck);
+         this.lureSpeed = Math.max(0, lureSpeed);
+        // Paper start - Configurable fishing time ranges
+        this.minWaitTime = level.paperConfig().fishingTimeRange.minimum;
+        this.maxWaitTime = level.paperConfig().fishingTimeRange.maximum;
+        // Paper end - Configurable fishing time ranges
+     }
+ 
+     public FishingHook(EntityType<? extends FishingHook> entityType, Level level) {
+@@ -147,12 +_,12 @@
+         super.tick();
+         Player playerOwner = this.getPlayerOwner();
+         if (playerOwner == null) {
+-            this.discard();
+            this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
+         } else if (this.level().isClientSide || !this.shouldStopFishing(playerOwner)) {
+             if (this.onGround()) {
+                 this.life++;
+                 if (this.life >= 1200) {
+-                    this.discard();
+                    this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
+                     return;
+                 }
+             } else {
+@@ -251,14 +_,14 @@
+         if (!player.isRemoved() && player.isAlive() && (isFishingRod || isFishingRod1) && !(this.distanceToSqr(player) > 1024.0)) {
+             return false;
+         } else {
+-            this.discard();
+            this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
+             return true;
+         }
+     }
+ 
+     private void checkCollision() {
+         HitResult hitResultOnMoveVector = ProjectileUtil.getHitResultOnMoveVector(this, this::canHitEntity);
+-        this.hitTargetOrDeflectSelf(hitResultOnMoveVector);
+        this.preHitTargetOrDeflectSelf(hitResultOnMoveVector);
+     }
+ 
+     @Override
+@@ -289,11 +_,11 @@
+         ServerLevel serverLevel = (ServerLevel)this.level();
+         int i = 1;
+         BlockPos blockPos = pos.above();
+-        if (this.random.nextFloat() < 0.25F && this.level().isRainingAt(blockPos)) {
+        if (this.rainInfluenced && this.random.nextFloat() < 0.25F && this.level().isRainingAt(blockPos)) { // CraftBukkit
+             i++;
+         }
+ 
+-        if (this.random.nextFloat() < 0.5F && !this.level().canSeeSky(blockPos)) {
+        if (this.skyInfluenced && this.random.nextFloat() < 0.5F && !this.level().canSeeSky(blockPos)) { // CraftBukkit
+             i--;
+         }
+ 
+@@ -303,6 +_,10 @@
+                 this.timeUntilLured = 0;
+                 this.timeUntilHooked = 0;
+                 this.getEntityData().set(DATA_BITING, false);
+                // CraftBukkit start
+                org.bukkit.event.player.PlayerFishEvent playerFishEvent = new org.bukkit.event.player.PlayerFishEvent((org.bukkit.entity.Player) this.getPlayerOwner().getBukkitEntity(), null, (org.bukkit.entity.FishHook) this.getBukkitEntity(), org.bukkit.event.player.PlayerFishEvent.State.FAILED_ATTEMPT);
+                this.level().getCraftServer().getPluginManager().callEvent(playerFishEvent);
+                // CraftBukkit end
+             }
+         } else if (this.timeUntilHooked > 0) {
+             this.timeUntilHooked -= i;
+@@ -326,6 +_,13 @@
+                     serverLevel.sendParticles(ParticleTypes.FISHING, d, d1, d2, 0, -f2, 0.01, f1, 1.0);
+                 }
+             } else {
+                // CraftBukkit start
+                org.bukkit.event.player.PlayerFishEvent playerFishEvent = new org.bukkit.event.player.PlayerFishEvent((org.bukkit.entity.Player) this.getPlayerOwner().getBukkitEntity(), null, (org.bukkit.entity.FishHook) this.getBukkitEntity(), org.bukkit.event.player.PlayerFishEvent.State.BITE);
+                this.level().getCraftServer().getPluginManager().callEvent(playerFishEvent);
+                if (playerFishEvent.isCancelled()) {
+                    return;
+                }
+                // CraftBukkit end
+                 this.playSound(SoundEvents.FISHING_BOBBER_SPLASH, 0.25F, 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.4F);
+                 double d3 = this.getY() + 0.5;
+                 serverLevel.sendParticles(
+@@ -377,14 +_,33 @@
+             }
+ 
+             if (this.timeUntilLured <= 0) {
+-                this.fishAngle = Mth.nextFloat(this.random, 0.0F, 360.0F);
+-                this.timeUntilHooked = Mth.nextInt(this.random, 20, 80);
+                // CraftBukkit start - logic to modify fishing wait time, lure time, and lure angle
+                this.fishAngle = Mth.nextFloat(this.random, this.minLureAngle, this.maxLureAngle);
+                this.timeUntilHooked = Mth.nextInt(this.random, this.minLureTime, this.maxLureTime);
+                // CraftBukkit end
+                // Paper start - Add missing fishing event state
+                if (this.getPlayerOwner() != null) {
+                    org.bukkit.event.player.PlayerFishEvent playerFishEvent = new org.bukkit.event.player.PlayerFishEvent((org.bukkit.entity.Player) this.getPlayerOwner().getBukkitEntity(), null, (org.bukkit.entity.FishHook) this.getBukkitEntity(), org.bukkit.event.player.PlayerFishEvent.State.LURED);
+                    if (!playerFishEvent.callEvent()) {
+                        this.timeUntilHooked = 0;
+                        return;
+                    }
+                }
+                // Paper end - Add missing fishing event state
+             }
+         } else {
+-            this.timeUntilLured = Mth.nextInt(this.random, 100, 600);
+-            this.timeUntilLured = this.timeUntilLured - this.lureSpeed;
+            // CraftBukkit start - logic to modify fishing wait time
+            this.resetTimeUntilLured(); // Paper - more projectile api - extract time until lured reset logic
+            // CraftBukkit end
+         }
+     }
+
+    // Paper start - more projectile api - extract time until lured reset logic
+    public void resetTimeUntilLured() {
+        this.timeUntilLured = Mth.nextInt(this.random, this.minWaitTime, this.maxWaitTime);
+        this.timeUntilLured -= (this.applyLure) ? (this.lureSpeed >= this.maxWaitTime ? this.timeUntilLured - 1 : this.lureSpeed ) : 0; // Paper - Fix Lure infinite loop
+    }
+    // Paper end - more projectile api - extract time until lured reset logic
+ 
+     public boolean calculateOpenWater(BlockPos pos) {
+         FishingHook.OpenWaterType openWaterType = FishingHook.OpenWaterType.INVALID;
+@@ -443,15 +_,34 @@
+     public void readAdditionalSaveData(CompoundTag compound) {
+     }
+ 
+
+    // Paper start - Add hand parameter to PlayerFishEvent
+    @Deprecated
+    @io.papermc.paper.annotation.DoNotUse
+     public int retrieve(ItemStack stack) {
+        return this.retrieve(net.minecraft.world.InteractionHand.MAIN_HAND, stack);
+    }
+
+    public int retrieve(net.minecraft.world.InteractionHand hand, ItemStack stack) {
+        // Paper end - Add hand parameter to PlayerFishEvent
+         Player playerOwner = this.getPlayerOwner();
+         if (!this.level().isClientSide && playerOwner != null && !this.shouldStopFishing(playerOwner)) {
+             int i = 0;
+             if (this.hookedIn != null) {
+                // CraftBukkit start
+                org.bukkit.event.player.PlayerFishEvent playerFishEvent = new org.bukkit.event.player.PlayerFishEvent((org.bukkit.entity.Player) playerOwner.getBukkitEntity(), this.hookedIn.getBukkitEntity(), (org.bukkit.entity.FishHook) this.getBukkitEntity(), org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand), org.bukkit.event.player.PlayerFishEvent.State.CAUGHT_ENTITY); // Paper - Add hand parameter to PlayerFishEvent
+                this.level().getCraftServer().getPluginManager().callEvent(playerFishEvent);
+
+                if (playerFishEvent.isCancelled()) {
+                    return 0;
+                }
+                if (this.hookedIn != null) { // Paper - re-check to see if there is a hooked entity
+                // CraftBukkit end
+                 this.pullEntity(this.hookedIn);
+                 CriteriaTriggers.FISHING_ROD_HOOKED.trigger((ServerPlayer)playerOwner, stack, this, Collections.emptyList());
+                 this.level().broadcastEntityEvent(this, (byte)31);
+                 i = this.hookedIn instanceof ItemEntity ? 3 : 5;
+                } // Paper - re-check to see if there is a hooked entity
+             } else if (this.nibble > 0) {
+                 LootParams lootParams = new LootParams.Builder((ServerLevel)this.level())
+                     .withParameter(LootContextParams.ORIGIN, this.position())
+@@ -464,19 +_,43 @@
+                 CriteriaTriggers.FISHING_ROD_HOOKED.trigger((ServerPlayer)playerOwner, stack, this, randomItems);
+ 
+                 for (ItemStack itemStack : randomItems) {
+-                    ItemEntity itemEntity = new ItemEntity(this.level(), this.getX(), this.getY(), this.getZ(), itemStack);
+                    // Paper start - new ItemEntity would throw if for whatever reason (mostly shitty datapacks) the itemStack turns out to be empty
+                    // if the item stack is empty we instead just have our itemEntity as null
+                    ItemEntity itemEntity = null;
+                    if (!itemStack.isEmpty()) {
+                        itemEntity = new ItemEntity(this.level(), this.getX(), this.getY(), this.getZ(), itemStack);
+                    }
+                    // Paper end
+                    // CraftBukkit start
+                    org.bukkit.event.player.PlayerFishEvent playerFishEvent = new org.bukkit.event.player.PlayerFishEvent((org.bukkit.entity.Player) playerOwner.getBukkitEntity(), itemEntity != null ? itemEntity.getBukkitEntity() : null, (org.bukkit.entity.FishHook) this.getBukkitEntity(), org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand), org.bukkit.event.player.PlayerFishEvent.State.CAUGHT_FISH); // Paper - itemEntity may be null // Paper - Add hand parameter to PlayerFishEvent
+                    playerFishEvent.setExpToDrop(this.random.nextInt(6) + 1);
+                    this.level().getCraftServer().getPluginManager().callEvent(playerFishEvent);
+
+                    if (playerFishEvent.isCancelled()) {
+                        return 0;
+                    }
+                    // CraftBukkit end
+                     double d = playerOwner.getX() - this.getX();
+                     double d1 = playerOwner.getY() - this.getY();
+                     double d2 = playerOwner.getZ() - this.getZ();
+                     double d3 = 0.1;
+-                    itemEntity.setDeltaMovement(d * 0.1, d1 * 0.1 + Math.sqrt(Math.sqrt(d * d + d1 * d1 + d2 * d2)) * 0.08, d2 * 0.1);
+-                    this.level().addFreshEntity(itemEntity);
+-                    playerOwner.level()
+-                        .addFreshEntity(
+-                            new ExperienceOrb(
+-                                playerOwner.level(), playerOwner.getX(), playerOwner.getY() + 0.5, playerOwner.getZ() + 0.5, this.random.nextInt(6) + 1
+-                            )
+-                        );
+                    // Paper start - entity item can be null, so we need to check against this
+                    if (itemEntity != null) {
+                        itemEntity.setDeltaMovement(d * 0.1, d1 * 0.1 + Math.sqrt(Math.sqrt(d * d + d1 * d1 + d2 * d2)) * 0.08, d2 * 0.1);
+                        this.level().addFreshEntity(itemEntity);
+                    }
+                    // Paper end
+                    // CraftBukkit start - this.random.nextInt(6) + 1 -> playerFishEvent.getExpToDrop()
+                    if (playerFishEvent.getExpToDrop() > 0) {
+                        playerOwner.level()
+                            .addFreshEntity(
+                                new ExperienceOrb(
+                                    playerOwner.level(), playerOwner.getX(), playerOwner.getY() + 0.5, playerOwner.getZ() + 0.5, playerFishEvent.getExpToDrop(), org.bukkit.entity.ExperienceOrb.SpawnReason.FISHING, this.getPlayerOwner(), this // Paper
+                                )
+                            );
+                    }
+                    // CraftBukkit end
+
+                     if (itemStack.is(ItemTags.FISHES)) {
+                         playerOwner.awardStat(Stats.FISH_CAUGHT, 1);
+                     }
+@@ -486,10 +_,27 @@
+             }
+ 
+             if (this.onGround()) {
+                // CraftBukkit start
+                org.bukkit.event.player.PlayerFishEvent playerFishEvent = new org.bukkit.event.player.PlayerFishEvent((org.bukkit.entity.Player) playerOwner.getBukkitEntity(), null, (org.bukkit.entity.FishHook) this.getBukkitEntity(), org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand), org.bukkit.event.player.PlayerFishEvent.State.IN_GROUND); // Paper - Add hand parameter to PlayerFishEvent
+                this.level().getCraftServer().getPluginManager().callEvent(playerFishEvent);
+
+                if (playerFishEvent.isCancelled()) {
+                    return 0;
+                }
+                // CraftBukkit end
+                 i = 2;
+             }
+            // CraftBukkit start
+            if (i == 0) {
+                org.bukkit.event.player.PlayerFishEvent playerFishEvent = new org.bukkit.event.player.PlayerFishEvent((org.bukkit.entity.Player) playerOwner.getBukkitEntity(), null, (org.bukkit.entity.FishHook) this.getBukkitEntity(), org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand), org.bukkit.event.player.PlayerFishEvent.State.REEL_IN); // Paper - Add hand parameter to PlayerFishEvent
+                this.level().getCraftServer().getPluginManager().callEvent(playerFishEvent);
+                if (playerFishEvent.isCancelled()) {
+                    return 0;
+                }
+            }
+            // CraftBukkit end
+ 
+-            this.discard();
+            this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
+             return i;
+         } else {
+             return 0;
+@@ -520,8 +_,15 @@
+ 
+     @Override
+     public void remove(Entity.RemovalReason reason) {
+        // CraftBukkit start - add Bukkit remove cause
+        this.remove(reason, null);
+    }
+
+    @Override
+    public void remove(Entity.RemovalReason reason, org.bukkit.event.entity.EntityRemoveEvent.Cause cause) {
+        // CraftBukkit end
+         this.updateOwnerInfo(null);
+-        super.remove(reason);
+        super.remove(reason, cause); // CraftBukkit - add Bukkit remove cause
+     }
+ 
+     @Override
+@@ -570,7 +_,7 @@
+         if (this.getPlayerOwner() == null) {
+             int data = packet.getData();
+             LOGGER.error("Failed to recreate fishing hook on client. {} (id: {}) is not a valid owner.", this.level().getEntity(data), data);
+-            this.discard();
+            this.discard(null); // CraftBukkit - add Bukkit remove cause
+         }
+     }
+ 
--- a/paper-server/patches/sources/net/minecraft/world/entity/projectile/LargeFireball.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/projectile/LargeFireball.java.patch
@@ -0,0 +1,45 @@
+--- a/net/minecraft/world/entity/projectile/LargeFireball.java
+++ b/net/minecraft/world/entity/projectile/LargeFireball.java
+@@ -18,11 +_,13 @@
+ 
+     public LargeFireball(EntityType<? extends LargeFireball> entityType, Level level) {
+         super(entityType, level);
+        this.isIncendiary = (level instanceof ServerLevel serverLevel) && serverLevel.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING); // CraftBukkit
+     }
+ 
+     public LargeFireball(Level level, LivingEntity owner, Vec3 movement, int explosionPower) {
+         super(EntityType.FIREBALL, owner, movement, level);
+         this.explosionPower = explosionPower;
+        this.isIncendiary = (level instanceof ServerLevel serverLevel) && serverLevel.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING); // CraftBukkit
+     }
+ 
+     @Override
+@@ -30,8 +_,16 @@
+         super.onHit(result);
+         if (this.level() instanceof ServerLevel serverLevel) {
+             boolean _boolean = serverLevel.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING);
+-            this.level().explode(this, this.getX(), this.getY(), this.getZ(), this.explosionPower, _boolean, Level.ExplosionInteraction.MOB);
+-            this.discard();
+            // CraftBukkit start - fire ExplosionPrimeEvent
+            org.bukkit.event.entity.ExplosionPrimeEvent event = new org.bukkit.event.entity.ExplosionPrimeEvent((org.bukkit.entity.Explosive) this.getBukkitEntity());
+            this.level().getCraftServer().getPluginManager().callEvent(event);
+
+            if (!event.isCancelled()) {
+                // give 'this' instead of (Entity) null so we know what causes the damage
+                this.level().explode(this, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), Level.ExplosionInteraction.MOB);
+            }
+            // CraftBukkit end
+            this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.HIT); // CraftBukkit - add Bukkit remove cause
+         }
+     }
+ 
+@@ -57,7 +_,8 @@
+     public void readAdditionalSaveData(CompoundTag compound) {
+         super.readAdditionalSaveData(compound);
+         if (compound.contains("ExplosionPower", 99)) {
+-            this.explosionPower = compound.getByte("ExplosionPower");
+            // CraftBukkit - set bukkitYield when setting explosionpower
+            this.bukkitYield = this.explosionPower = compound.getByte("ExplosionPower");
+         }
+     }
+ }
--- a/paper-server/patches/sources/net/minecraft/world/entity/projectile/LlamaSpit.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/projectile/LlamaSpit.java.patch
@@ -0,0 +1,31 @@
+--- a/net/minecraft/world/entity/projectile/LlamaSpit.java
+++ b/net/minecraft/world/entity/projectile/LlamaSpit.java
+@@ -43,16 +_,16 @@
+         super.tick();
+         Vec3 deltaMovement = this.getDeltaMovement();
+         HitResult hitResultOnMoveVector = ProjectileUtil.getHitResultOnMoveVector(this, this::canHitEntity);
+-        this.hitTargetOrDeflectSelf(hitResultOnMoveVector);
+        this.preHitTargetOrDeflectSelf(hitResultOnMoveVector); // CraftBukkit - projectile hit event
+         double d = this.getX() + deltaMovement.x;
+         double d1 = this.getY() + deltaMovement.y;
+         double d2 = this.getZ() + deltaMovement.z;
+         this.updateRotation();
+         float f = 0.99F;
+         if (this.level().getBlockStates(this.getBoundingBox()).noneMatch(BlockBehaviour.BlockStateBase::isAir)) {
+-            this.discard();
+            this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
+         } else if (this.isInWaterOrBubble()) {
+-            this.discard();
+            this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
+         } else {
+             this.setDeltaMovement(deltaMovement.scale(0.99F));
+             this.applyGravity();
+@@ -76,7 +_,7 @@
+     protected void onHitBlock(BlockHitResult result) {
+         super.onHitBlock(result);
+         if (!this.level().isClientSide) {
+-            this.discard();
+            this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.HIT); // CraftBukkit - add Bukkit remove cause
+         }
+     }
+ 
--- a/paper-server/patches/sources/net/minecraft/world/entity/projectile/Projectile.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/projectile/Projectile.java.patch
@@ -0,0 +1,230 @@
+--- a/net/minecraft/world/entity/projectile/Projectile.java
+++ b/net/minecraft/world/entity/projectile/Projectile.java
+@@ -43,6 +_,7 @@
+     public boolean hasBeenShot;
+     @Nullable
+     private Entity lastDeflectedBy;
+    protected boolean hitCancelled = false; // CraftBukkit
+ 
+     Projectile(EntityType<? extends Projectile> entityType, Level level) {
+         super(entityType, level);
+@@ -53,15 +_,36 @@
+             this.ownerUUID = owner.getUUID();
+             this.cachedOwner = owner;
+         }
+-    }
+        // Paper start - Refresh ProjectileSource for projectiles
+        else {
+            this.ownerUUID = null;
+            this.cachedOwner = null;
+            this.projectileSource = null;
+        }
+        // Paper end - Refresh ProjectileSource for projectiles
+        this.refreshProjectileSource(false); // Paper
+    }
+
+    // Paper start - Refresh ProjectileSource for projectiles
+    public void refreshProjectileSource(boolean fillCache) {
+        if (fillCache) {
+            this.getOwner();
+        }
+        if (this.cachedOwner != null && !this.cachedOwner.isRemoved() && this.projectileSource == null && this.cachedOwner.getBukkitEntity() instanceof org.bukkit.projectiles.ProjectileSource projSource) {
+            this.projectileSource = projSource;
+        }
+    }
+    // Paper end - Refresh ProjectileSource for projectiles
+ 
+     @Nullable
+     @Override
+     public Entity getOwner() {
+         if (this.cachedOwner != null && !this.cachedOwner.isRemoved()) {
+            this.refreshProjectileSource(false); // Paper - Refresh ProjectileSource for projectiles
+             return this.cachedOwner;
+         } else if (this.ownerUUID != null) {
+             this.cachedOwner = this.findOwner(this.ownerUUID);
+            this.refreshProjectileSource(false); // Paper - Refresh ProjectileSource for projectiles
+             return this.cachedOwner;
+         } else {
+             return null;
+@@ -98,6 +_,7 @@
+     protected void readAdditionalSaveData(CompoundTag compound) {
+         if (compound.hasUUID("Owner")) {
+             this.setOwnerThroughUUID(compound.getUUID("Owner"));
+            if (this instanceof ThrownEnderpearl && this.level().paperConfig().fixes.disableUnloadedChunkEnderpearlExploit && this.level().paperConfig().misc.legacyEnderPearlBehavior) { this.ownerUUID = null; } // Paper - Reset pearls when they stop being ticked; Don't store shooter name for pearls to block enderpearl travel exploit
+         }
+ 
+         this.leftOwner = compound.getBoolean("LeftOwner");
+@@ -175,13 +_,22 @@
+         float f2 = Mth.cos(y * (float) (Math.PI / 180.0)) * Mth.cos(x * (float) (Math.PI / 180.0));
+         this.shoot(f, f1, f2, velocity, inaccuracy);
+         Vec3 knownMovement = shooter.getKnownMovement();
+        // Paper start - allow disabling relative velocity
+        if (!shooter.level().paperConfig().misc.disableRelativeProjectileVelocity) {
+         this.setDeltaMovement(this.getDeltaMovement().add(knownMovement.x, shooter.onGround() ? 0.0 : knownMovement.y, knownMovement.z));
+        }
+        // Paper end - allow disabling relative velocity
+     }
+ 
+     public static <T extends Projectile> T spawnProjectileFromRotation(
+         Projectile.ProjectileFactory<T> factory, ServerLevel level, ItemStack spawnedFrom, LivingEntity owner, float z, float velocity, float innaccuracy
+     ) {
+-        return spawnProjectile(
+        // Paper start - PlayerLaunchProjectileEvent
+        return spawnProjectileFromRotationDelayed(factory, level, spawnedFrom, owner, z, velocity, innaccuracy).spawn();
+    }
+    public static <T extends Projectile> Delayed<T> spawnProjectileFromRotationDelayed(Projectile.ProjectileFactory<T> factory, ServerLevel level, ItemStack spawnedFrom, LivingEntity owner, float z, float velocity, float innaccuracy) {
+        return spawnProjectileDelayed(
+        // Paper end - PlayerLaunchProjectileEvent
+             factory.create(level, owner, spawnedFrom),
+             level,
+             spawnedFrom,
+@@ -200,7 +_,22 @@
+         float velocity,
+         float inaccuracy
+     ) {
+-        return spawnProjectile(factory.create(level, owner, spawnedFrom), level, spawnedFrom, projectile -> projectile.shoot(x, y, z, velocity, inaccuracy));
+        // Paper start - fixes and addition to spawn reason API
+        return Projectile.spawnProjectileUsingShootDelayed(factory, level, spawnedFrom, owner, x, y, z, velocity, inaccuracy).spawn();
+    }
+    public static <T extends Projectile> Delayed<T> spawnProjectileUsingShootDelayed(
+        Projectile.ProjectileFactory<T> factory,
+        ServerLevel level,
+        ItemStack spawnedFrom,
+        LivingEntity owner,
+        double x,
+        double y,
+        double z,
+        float velocity,
+        float inaccuracy
+    ) {
+        return spawnProjectileDelayed(factory.create(level, owner, spawnedFrom), level, spawnedFrom, projectile -> projectile.shoot(x, y, z, velocity, inaccuracy));
+        // Paper end - fixes and addition to spawn reason API
+     }
+ 
+     public static <T extends Projectile> T spawnProjectileUsingShoot(
+@@ -214,11 +_,45 @@
+     }
+ 
+     public static <T extends Projectile> T spawnProjectile(T projectile, ServerLevel level, ItemStack stack, Consumer<T> adapter) {
+        // Paper start - delayed projectile spawning
+        return spawnProjectileDelayed(projectile, level, stack, adapter).spawn();
+    }
+    public static <T extends Projectile> Delayed<T> spawnProjectileDelayed(T projectile, ServerLevel level, ItemStack stack, Consumer<T> adapter) {
+        // Paper end - delayed projectile spawning
+         adapter.accept(projectile);
+-        level.addFreshEntity(projectile);
+-        projectile.applyOnProjectileSpawned(level, stack);
+-        return projectile;
+-    }
+        return new Delayed<>(projectile, level, stack); // Paper - delayed projectile spawning
+    }
+
+    // Paper start - delayed projectile spawning
+    public record Delayed<T extends Projectile>(
+        T projectile,
+        ServerLevel world,
+        ItemStack projectileStack
+    ) {
+        // Taken from net.minecraft.world.entity.projectile.Projectile.spawnProjectile(T, net.minecraft.server.level.ServerLevel, net.minecraft.world.item.ItemStack, java.util.function.Consumer<T>)
+        public boolean attemptSpawn() {
+            if (!this.world.addFreshEntity(this.projectile)) return false;
+            this.projectile.applyOnProjectileSpawned(this.world, this.projectileStack);
+            return true;
+        }
+
+        public T spawn() {
+            this.attemptSpawn();
+            return this.projectile();
+        }
+
+        public boolean attemptSpawn(final org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
+            if (!this.world.addFreshEntity(this.projectile, reason)) return false;
+            this.projectile.applyOnProjectileSpawned(this.world, this.projectileStack);
+            return true;
+        }
+
+        public T spawn(final org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
+            this.attemptSpawn(reason);
+            return this.projectile();
+        }
+    }
+    // Paper end - delayed projectile spawning
+ 
+     public void applyOnProjectileSpawned(ServerLevel level, ItemStack spawnedFrom) {
+         EnchantmentHelper.onProjectileSpawned(level, spawnedFrom, this, item -> {});
+@@ -230,6 +_,17 @@
+         }
+     }
+ 
+    // CraftBukkit start - call projectile hit event
+    public ProjectileDeflection preHitTargetOrDeflectSelf(HitResult hitResult) { // Paper - protected -> public
+        org.bukkit.event.entity.ProjectileHitEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this, hitResult);
+        this.hitCancelled = event != null && event.isCancelled();
+        if (hitResult.getType() == HitResult.Type.BLOCK || !this.hitCancelled) {
+            return this.hitTargetOrDeflectSelf(hitResult);
+        }
+        return ProjectileDeflection.NONE;
+    }
+    // CraftBukkit end
+
+     protected ProjectileDeflection hitTargetOrDeflectSelf(HitResult hitResult) {
+         if (hitResult.getType() == HitResult.Type.ENTITY) {
+             EntityHitResult entityHitResult = (EntityHitResult)hitResult;
+@@ -261,7 +_,13 @@
+     public boolean deflect(ProjectileDeflection deflection, @Nullable Entity entity, @Nullable Entity owner, boolean deflectedByPlayer) {
+         deflection.deflect(this, entity, this.random);
+         if (!this.level().isClientSide) {
+-            this.setOwner(owner);
+            // Paper start - Fix PickupStatus getting reset
+            if (this instanceof AbstractArrow arrow) {
+                arrow.setOwner(owner, false);
+            } else {
+                this.setOwner(owner);
+            }
+            // Paper end - Fix PickupStatus getting reset
+             this.onDeflection(entity, deflectedByPlayer);
+         }
+ 
+@@ -297,6 +_,11 @@
+     }
+ 
+     protected void onHitBlock(BlockHitResult result) {
+        // CraftBukkit start - cancellable hit event
+        if (this.hitCancelled) {
+            return;
+        }
+        // CraftBukkit end
+         BlockState blockState = this.level().getBlockState(result.getBlockPos());
+         blockState.onProjectileHit(this.level(), blockState, result, this);
+     }
+@@ -306,6 +_,15 @@
+             return false;
+         } else {
+             Entity owner = this.getOwner();
+            // Paper start - Cancel hit for vanished players
+            if (owner instanceof net.minecraft.server.level.ServerPlayer && target instanceof net.minecraft.server.level.ServerPlayer) {
+                org.bukkit.entity.Player collided = (org.bukkit.entity.Player) target.getBukkitEntity();
+                org.bukkit.entity.Player shooter = (org.bukkit.entity.Player) owner.getBukkitEntity();
+                if (!shooter.canSee(collided)) {
+                    return false;
+                }
+            }
+            // Paper end - Cancel hit for vanished players
+             return owner == null || this.leftOwner || !owner.isPassengerOfSameVehicle(target);
+         }
+     }
+@@ -318,13 +_,7 @@
+     }
+ 
+     protected static float lerpRotation(float currentRotation, float targetRotation) {
+-        while (targetRotation - currentRotation < -180.0F) {
+-            currentRotation -= 360.0F;
+-        }
+-
+-        while (targetRotation - currentRotation >= 180.0F) {
+-            currentRotation += 360.0F;
+-        }
+        currentRotation += Math.round((targetRotation - currentRotation) / 360.0F) * 360.0F; // Paper - stop large look changes from crashing the server
+ 
+         return Mth.lerp(0.2F, currentRotation, targetRotation);
+     }
--- a/paper-server/patches/sources/net/minecraft/world/entity/projectile/ShulkerBullet.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/projectile/ShulkerBullet.java.patch
@@ -0,0 +1,91 @@
+--- a/net/minecraft/world/entity/projectile/ShulkerBullet.java
+++ b/net/minecraft/world/entity/projectile/ShulkerBullet.java
+@@ -57,7 +_,21 @@
+         this.finalTarget = finalTarget;
+         this.currentMoveDirection = Direction.UP;
+         this.selectNextMoveDirection(axis);
+-    }
+        this.projectileSource = shooter.getBukkitLivingEntity(); // CraftBukkit
+    }
+
+    // CraftBukkit start
+    @Nullable
+    public Entity getTarget() {
+        return this.finalTarget;
+    }
+
+    public void setTarget(Entity e) {
+        this.finalTarget = e;
+        this.currentMoveDirection = Direction.UP;
+        this.selectNextMoveDirection(Direction.Axis.X);
+    }
+    // CraftBukkit end
+ 
+     @Override
+     public SoundSource getSoundSource() {
+@@ -187,7 +_,7 @@
+     @Override
+     public void checkDespawn() {
+         if (this.level().getDifficulty() == Difficulty.PEACEFUL) {
+-            this.discard();
+            this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
+         }
+     }
+ 
+@@ -233,7 +_,7 @@
+         }
+ 
+         if (hitResult != null && this.isAlive() && hitResult.getType() != HitResult.Type.MISS) {
+-            this.hitTargetOrDeflectSelf(hitResult);
+            this.preHitTargetOrDeflectSelf(hitResult); // CraftBukkit - projectile hit event
+         }
+ 
+         ProjectileUtil.rotateTowardsMovement(this, 0.5F);
+@@ -301,7 +_,7 @@
+             }
+ 
+             if (entity instanceof LivingEntity livingEntity1) {
+-                livingEntity1.addEffect(new MobEffectInstance(MobEffects.LEVITATION, 200), MoreObjects.firstNonNull(owner, this));
+                livingEntity1.addEffect(new MobEffectInstance(MobEffects.LEVITATION, 200), MoreObjects.firstNonNull(owner, this), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.ATTACK); // CraftBukkit
+             }
+         }
+     }
+@@ -314,14 +_,20 @@
+     }
+ 
+     private void destroy() {
+-        this.discard();
+        // CraftBukkit start - add Bukkit remove cause
+        this.destroy(null);
+    }
+
+    private void destroy(org.bukkit.event.entity.EntityRemoveEvent.Cause cause) {
+        this.discard(cause);
+        // CraftBukkit end
+         this.level().gameEvent(GameEvent.ENTITY_DAMAGE, this.position(), GameEvent.Context.of(this));
+     }
+ 
+     @Override
+     protected void onHit(HitResult result) {
+         super.onHit(result);
+-        this.destroy();
+        this.destroy(org.bukkit.event.entity.EntityRemoveEvent.Cause.HIT); // CraftBukkit - add Bukkit remove cause
+     }
+ 
+     @Override
+@@ -336,9 +_,14 @@
+ 
+     @Override
+     public boolean hurtServer(ServerLevel level, DamageSource damageSource, float amount) {
+        // CraftBukkit start
+        if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damageSource, amount, false)) {
+            return false;
+        }
+        // CraftBukkit end
+         this.playSound(SoundEvents.SHULKER_BULLET_HURT, 1.0F, 1.0F);
+         level.sendParticles(ParticleTypes.CRIT, this.getX(), this.getY(), this.getZ(), 15, 0.2, 0.2, 0.2, 0.0);
+-        this.destroy();
+        this.destroy(org.bukkit.event.entity.EntityRemoveEvent.Cause.DEATH); // CraftBukkit - add Bukkit remove cause
+         return true;
+     }
+ 
--- a/paper-server/patches/sources/net/minecraft/world/entity/projectile/SmallFireball.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/projectile/SmallFireball.java.patch
@@ -0,0 +1,51 @@
+--- a/net/minecraft/world/entity/projectile/SmallFireball.java
+++ b/net/minecraft/world/entity/projectile/SmallFireball.java
+@@ -23,6 +_,11 @@
+ 
+     public SmallFireball(Level level, LivingEntity owner, Vec3 movement) {
+         super(EntityType.SMALL_FIREBALL, owner, movement, level);
+        // CraftBukkit start
+        if (this.getOwner() != null && this.getOwner() instanceof Mob) {
+            this.isIncendiary = (level instanceof ServerLevel serverLevel) && serverLevel.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING);
+        }
+        // CraftBukkit end
+     }
+ 
+     public SmallFireball(Level level, double x, double y, double z, Vec3 movement) {
+@@ -36,7 +_,14 @@
+             Entity var7 = result.getEntity();
+             Entity owner = this.getOwner();
+             int remainingFireTicks = var7.getRemainingFireTicks();
+-            var7.igniteForSeconds(5.0F);
+            // CraftBukkit start - Entity damage by entity event + combust event
+            org.bukkit.event.entity.EntityCombustByEntityEvent event = new org.bukkit.event.entity.EntityCombustByEntityEvent(this.getBukkitEntity(), var7.getBukkitEntity(), 5.0F);
+            var7.level().getCraftServer().getPluginManager().callEvent(event);
+
+            if (!event.isCancelled()) {
+                var7.igniteForSeconds(event.getDuration(), false);
+            }
+            // CraftBukkit end
+             DamageSource damageSource = this.damageSources().fireball(this, owner);
+             if (!var7.hurtServer(serverLevel, damageSource, 5.0F)) {
+                 var7.setRemainingFireTicks(remainingFireTicks);
+@@ -51,9 +_,9 @@
+         super.onHitBlock(result);
+         if (this.level() instanceof ServerLevel serverLevel) {
+             Entity owner = this.getOwner();
+-            if (!(owner instanceof Mob) || serverLevel.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) {
+            if (this.isIncendiary) { // CraftBukkit
+                 BlockPos blockPos = result.getBlockPos().relative(result.getDirection());
+-                if (this.level().isEmptyBlock(blockPos)) {
+                if (this.level().isEmptyBlock(blockPos) && !org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(this.level(), blockPos, this).isCancelled()) { // CraftBukkit
+                     this.level().setBlockAndUpdate(blockPos, BaseFireBlock.getState(this.level(), blockPos));
+                 }
+             }
+@@ -64,7 +_,7 @@
+     protected void onHit(HitResult result) {
+         super.onHit(result);
+         if (!this.level().isClientSide) {
+-            this.discard();
+            this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.HIT); // CraftBukkit - add Bukkit remove cause
+         }
+     }
+ }
--- a/paper-server/patches/sources/net/minecraft/world/entity/projectile/Snowball.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/projectile/Snowball.java.patch
@@ -0,0 +1,11 @@
+--- a/net/minecraft/world/entity/projectile/Snowball.java
+++ b/net/minecraft/world/entity/projectile/Snowball.java
+@@ -61,7 +_,7 @@
+         super.onHit(result);
+         if (!this.level().isClientSide) {
+             this.level().broadcastEntityEvent(this, (byte)3);
+-            this.discard();
+            this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.HIT); // CraftBukkit - add Bukkit remove cause
+         }
+     }
+ }
--- a/paper-server/patches/sources/net/minecraft/world/entity/projectile/SpectralArrow.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/projectile/SpectralArrow.java.patch
@@ -0,0 +1,11 @@
+--- a/net/minecraft/world/entity/projectile/SpectralArrow.java
+++ b/net/minecraft/world/entity/projectile/SpectralArrow.java
+@@ -38,7 +_,7 @@
+     protected void doPostHurtEffects(LivingEntity living) {
+         super.doPostHurtEffects(living);
+         MobEffectInstance mobEffectInstance = new MobEffectInstance(MobEffects.GLOWING, this.duration, 0);
+-        living.addEffect(mobEffectInstance, this.getEffectSource());
+        living.addEffect(mobEffectInstance, this.getEffectSource(), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.ARROW); // CraftBukkit
+     }
+ 
+     @Override
--- a/paper-server/patches/sources/net/minecraft/world/entity/projectile/ThrowableItemProjectile.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/projectile/ThrowableItemProjectile.java.patch
@@ -0,0 +1,15 @@
+--- a/net/minecraft/world/entity/projectile/ThrowableItemProjectile.java
+++ b/net/minecraft/world/entity/projectile/ThrowableItemProjectile.java
+@@ -35,6 +_,12 @@
+ 
+     protected abstract Item getDefaultItem();
+ 
+    // CraftBukkit start
+    public Item getDefaultItemPublic() {
+        return this.getDefaultItem();
+    }
+    // CraftBukkit end
+
+     @Override
+     public ItemStack getItem() {
+         return this.getEntityData().get(DATA_ITEM_STACK);
--- a/paper-server/patches/sources/net/minecraft/world/entity/projectile/ThrowableProjectile.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/projectile/ThrowableProjectile.java.patch
@@ -0,0 +1,11 @@
+--- a/net/minecraft/world/entity/projectile/ThrowableProjectile.java
+++ b/net/minecraft/world/entity/projectile/ThrowableProjectile.java
+@@ -59,7 +_,7 @@
+         this.applyEffectsFromBlocks();
+         super.tick();
+         if (hitResultOnMoveVector.getType() != HitResult.Type.MISS && this.isAlive()) {
+-            this.hitTargetOrDeflectSelf(hitResultOnMoveVector);
+            this.preHitTargetOrDeflectSelf(hitResultOnMoveVector); // CraftBukkit - projectile hit event
+         }
+     }
+ 
--- a/paper-server/patches/sources/net/minecraft/world/entity/projectile/ThrownEgg.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/projectile/ThrownEgg.java.patch
@@ -0,0 +1,63 @@
+--- a/net/minecraft/world/entity/projectile/ThrownEgg.java
+++ b/net/minecraft/world/entity/projectile/ThrownEgg.java
+@@ -59,22 +_,56 @@
+     protected void onHit(HitResult result) {
+         super.onHit(result);
+         if (!this.level().isClientSide) {
+-            if (this.random.nextInt(8) == 0) {
+            // CraftBukkit start
+            boolean hatching = this.random.nextInt(8) == 0;
+            if (true) {
+            // CraftBukkit end
+                 int i = 1;
+                 if (this.random.nextInt(32) == 0) {
+                     i = 4;
+                 }
+                // CraftBukkit start
+                org.bukkit.entity.EntityType hatchingType = org.bukkit.entity.EntityType.CHICKEN;
+
+                net.minecraft.world.entity.Entity shooter = this.getOwner();
+                if (!hatching) {
+                    i = 0;
+                }
+                if (shooter instanceof net.minecraft.server.level.ServerPlayer) {
+                    org.bukkit.event.player.PlayerEggThrowEvent event = new org.bukkit.event.player.PlayerEggThrowEvent((org.bukkit.entity.Player) shooter.getBukkitEntity(), (org.bukkit.entity.Egg) this.getBukkitEntity(), hatching, (byte) i, hatchingType);
+                    this.level().getCraftServer().getPluginManager().callEvent(event);
+
+                    i = event.getNumHatches();
+                    hatching = event.isHatching();
+                    hatchingType = event.getHatchingType();
+                    // If hatching is set to false, ensure child count is 0
+                    if (!hatching) {
+                        i = 0;
+                    }
+                }
+                // CraftBukkit end
+                // Paper start - Add ThrownEggHatchEvent
+                com.destroystokyo.paper.event.entity.ThrownEggHatchEvent event = new com.destroystokyo.paper.event.entity.ThrownEggHatchEvent((org.bukkit.entity.Egg) getBukkitEntity(), hatching, (byte) i, hatchingType);
+                event.callEvent();
+                hatching = event.isHatching();
+                i = hatching ? event.getNumHatches() : 0; // If hatching is set to false, ensure child count is 0
+                hatchingType = event.getHatchingType();
+                // Paper end - Add ThrownEggHatchEvent
+ 
+                 for (int i1 = 0; i1 < i; i1++) {
+-                    Chicken chicken = EntityType.CHICKEN.create(this.level(), EntitySpawnReason.TRIGGERED);
+                    net.minecraft.world.entity.Entity chicken = this.level().getWorld().makeEntity(new org.bukkit.Location(this.level().getWorld(), this.getX(), this.getY(), this.getZ(), this.getYRot(), 0.0F), hatchingType.getEntityClass()); // CraftBukkit
+                     if (chicken != null) {
+-                        chicken.setAge(-24000);
+                        // CraftBukkit start
+                        if (chicken.getBukkitEntity() instanceof org.bukkit.entity.Ageable ageable) {
+                            ageable.setBaby();
+                        }
+                        // CraftBukkit end
+                         chicken.moveTo(this.getX(), this.getY(), this.getZ(), this.getYRot(), 0.0F);
+                         if (!chicken.fudgePositionAfterSizeChange(ZERO_SIZED_DIMENSIONS)) {
+                             break;
+                         }
+ 
+-                        this.level().addFreshEntity(chicken);
+                        this.level().addFreshEntity(chicken, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.EGG); // CraftBukkit
+                     }
+                 }
+             }
--- a/paper-server/patches/sources/net/minecraft/world/entity/projectile/ThrownEnderpearl.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/projectile/ThrownEnderpearl.java.patch
@@ -0,0 +1,83 @@
+--- a/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
+++ b/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
+@@ -126,11 +_,18 @@
+                 Vec3 vec3 = this.oldPosition();
+                 if (owner instanceof ServerPlayer serverPlayer) {
+                     if (serverPlayer.connection.isAcceptingMessages()) {
+                        // CraftBukkit start
+                        ServerPlayer serverPlayer1 = serverPlayer.teleport(new TeleportTransition(serverLevel, vec3, Vec3.ZERO, 0.0F, 0.0F, Relative.union(Relative.ROTATION, Relative.DELTA), TeleportTransition.DO_NOTHING, org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.ENDER_PEARL));
+                        if (serverPlayer1 == null) {
+                            this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.HIT);
+                            return;
+                        }
+                        // CraftBukkit end
+                         if (this.random.nextFloat() < 0.05F && serverLevel.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING)) {
+                             Endermite endermite = EntityType.ENDERMITE.create(serverLevel, EntitySpawnReason.TRIGGERED);
+                             if (endermite != null) {
+                                 endermite.moveTo(owner.getX(), owner.getY(), owner.getZ(), owner.getYRot(), owner.getXRot());
+-                                serverLevel.addFreshEntity(endermite);
+                                serverLevel.addFreshEntity(endermite, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.ENDER_PEARL);
+                             }
+                         }
+ 
+@@ -138,15 +_,15 @@
+                             owner.setPortalCooldown();
+                         }
+ 
+-                        ServerPlayer serverPlayer1 = serverPlayer.teleport(
+-                            new TeleportTransition(
+-                                serverLevel, vec3, Vec3.ZERO, 0.0F, 0.0F, Relative.union(Relative.ROTATION, Relative.DELTA), TeleportTransition.DO_NOTHING
+-                            )
+-                        );
+                        // ServerPlayer serverPlayer1 = serverPlayer.teleport(
+                        //     new TeleportTransition(
+                        //         serverLevel, vec3, Vec3.ZERO, 0.0F, 0.0F, Relative.union(Relative.ROTATION, Relative.DELTA), TeleportTransition.DO_NOTHING
+                        //     )
+                        // );
+                         if (serverPlayer1 != null) {
+                             serverPlayer1.resetFallDistance();
+                             serverPlayer1.resetCurrentImpulseContext();
+-                            serverPlayer1.hurtServer(serverPlayer.serverLevel(), this.damageSources().enderPearl(), 5.0F);
+                            serverPlayer1.hurtServer(serverPlayer.serverLevel(), this.damageSources().enderPearl().customEventDamager(this), 5.0F); // CraftBukkit // Paper - fix DamageSource API
+                         }
+ 
+                         this.playSound(serverLevel, vec3);
+@@ -162,9 +_,9 @@
+                     this.playSound(serverLevel, vec3);
+                 }
+ 
+-                this.discard();
+                this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.HIT); // CraftBukkit - add Bukkit remove cause
+             } else {
+-                this.discard();
+                this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.HIT); // CraftBukkit - add Bukkit remove cause
+             }
+         }
+     }
+@@ -185,7 +_,7 @@
+         if (owner instanceof ServerPlayer serverPlayer
+             && !owner.isAlive()
+             && serverPlayer.serverLevel().getGameRules().getBoolean(GameRules.RULE_ENDER_PEARLS_VANISH_ON_DEATH)) {
+-            this.discard();
+            this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
+         } else {
+             super.tick();
+         }
+@@ -212,7 +_,7 @@
+     public Entity teleport(TeleportTransition teleportTransition) {
+         Entity entity = super.teleport(teleportTransition);
+         if (entity != null) {
+-            entity.placePortalTicket(BlockPos.containing(entity.position()));
+            if (!this.level().paperConfig().misc.legacyEnderPearlBehavior) entity.placePortalTicket(BlockPos.containing(entity.position())); // Paper - Allow using old ender pearl behavior
+         }
+ 
+         return entity;
+@@ -220,7 +_,7 @@
+ 
+     @Override
+     public boolean canTeleport(Level fromLevel, Level toLevel) {
+-        return fromLevel.dimension() == Level.END && toLevel.dimension() == Level.OVERWORLD && this.getOwner() instanceof ServerPlayer serverPlayer
+        return fromLevel.getTypeKey() == net.minecraft.world.level.dimension.LevelStem.END && toLevel.getTypeKey() == net.minecraft.world.level.dimension.LevelStem.OVERWORLD && this.getOwner() instanceof ServerPlayer serverPlayer // CraftBukkit
+             ? super.canTeleport(fromLevel, toLevel) && serverPlayer.seenCredits
+             : super.canTeleport(fromLevel, toLevel);
+     }
--- a/paper-server/patches/sources/net/minecraft/world/entity/projectile/ThrownExperienceBottle.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/projectile/ThrownExperienceBottle.java.patch
@@ -0,0 +1,23 @@
+--- a/net/minecraft/world/entity/projectile/ThrownExperienceBottle.java
+++ b/net/minecraft/world/entity/projectile/ThrownExperienceBottle.java
+@@ -37,10 +_,17 @@
+     protected void onHit(HitResult result) {
+         super.onHit(result);
+         if (this.level() instanceof ServerLevel) {
+-            this.level().levelEvent(2002, this.blockPosition(), -13083194);
+            // CraftBukkit - moved to after event
+             int i = 3 + this.level().random.nextInt(5) + this.level().random.nextInt(5);
+-            ExperienceOrb.award((ServerLevel)this.level(), this.position(), i);
+-            this.discard();
+            // CraftBukkit start
+            org.bukkit.event.entity.ExpBottleEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callExpBottleEvent(this, result, i);
+            i = event.getExperience();
+            if (event.getShowEffect()) {
+                this.level().levelEvent(net.minecraft.world.level.block.LevelEvent.PARTICLES_SPELL_POTION_SPLASH, this.blockPosition(), net.minecraft.world.item.alchemy.PotionContents.BASE_POTION_COLOR);
+            }
+            // CraftBukkit end
+            ExperienceOrb.award((ServerLevel)this.level(), this.position(), i, org.bukkit.entity.ExperienceOrb.SpawnReason.EXP_BOTTLE, this.getOwner(), this); // Paper
+            this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.HIT); // CraftBukkit - add Bukkit remove cause
+         }
+     }
+ }
--- a/paper-server/patches/sources/net/minecraft/world/entity/projectile/ThrownPotion.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/projectile/ThrownPotion.java.patch
@@ -0,0 +1,237 @@
+--- a/net/minecraft/world/entity/projectile/ThrownPotion.java
+++ b/net/minecraft/world/entity/projectile/ThrownPotion.java
+@@ -9,6 +_,7 @@
+ import net.minecraft.core.Holder;
+ import net.minecraft.core.component.DataComponents;
+ import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+ import net.minecraft.tags.BlockTags;
+ import net.minecraft.world.damagesource.DamageSource;
+ import net.minecraft.world.effect.MobEffect;
+@@ -82,51 +_,87 @@
+     @Override
+     protected void onHit(HitResult result) {
+         super.onHit(result);
+        // Paper start - More projectile API
+        this.splash(result);
+    }
+    public void splash(@Nullable HitResult result) {
+        // Paper end - More projectile API
+         if (this.level() instanceof ServerLevel serverLevel) {
+             ItemStack item = this.getItem();
+             PotionContents potionContents = item.getOrDefault(DataComponents.POTION_CONTENTS, PotionContents.EMPTY);
+            boolean showParticles = true; // Paper - Fix potions splash events
+             if (potionContents.is(Potions.WATER)) {
+-                this.applyWater(serverLevel);
+-            } else if (potionContents.hasEffects()) {
+                showParticles = this.applyWater(serverLevel, result); // Paper - Fix potions splash events
+            } else if (true || potionContents.hasEffects()) { // CraftBukkit - Call event even if no effects to apply
+                 if (this.isLingering()) {
+-                    this.makeAreaOfEffectCloud(potionContents);
+                    showParticles = this.makeAreaOfEffectCloud(potionContents, result); // CraftBukkit - Pass MovingObjectPosition // Paper
+                 } else {
+-                    this.applySplash(
+-                        serverLevel, potionContents.getAllEffects(), result.getType() == HitResult.Type.ENTITY ? ((EntityHitResult)result).getEntity() : null
+                    showParticles = this.applySplash(
+                        serverLevel, potionContents.getAllEffects(), result != null && result.getType() == HitResult.Type.ENTITY ? ((EntityHitResult)result).getEntity() : null, result  // CraftBukkit - Pass MovingObjectPosition // Paper - More projectile API
+                     );
+                 }
+             }
+ 
+            if (showParticles) { // Paper - Fix potions splash events
+             int i = potionContents.potion().isPresent() && potionContents.potion().get().value().hasInstantEffects() ? 2007 : 2002;
+             serverLevel.levelEvent(i, this.blockPosition(), potionContents.getColor());
+-            this.discard();
+            } // Paper - Fix potions splash events
+            this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.HIT); // CraftBukkit - add Bukkit remove cause
+         }
+     }
+ 
+-    private void applyWater(ServerLevel level) {
+    private static final Predicate<net.minecraft.world.entity.LivingEntity> APPLY_WATER_GET_ENTITIES_PREDICATE = ThrownPotion.WATER_SENSITIVE_OR_ON_FIRE.or(Axolotl.class::isInstance); // Paper - Fix potions splash events
+
+    private boolean applyWater(ServerLevel level, @Nullable HitResult result) { // Paper - Fix potions splash events
+         AABB aabb = this.getBoundingBox().inflate(4.0, 2.0, 4.0);
+ 
+-        for (LivingEntity livingEntity : this.level().getEntitiesOfClass(LivingEntity.class, aabb, WATER_SENSITIVE_OR_ON_FIRE)) {
+        // Paper start - Fix potions splash events
+        java.util.Map<org.bukkit.entity.LivingEntity, Double> affected = new java.util.HashMap<>();
+        java.util.Set<org.bukkit.entity.LivingEntity> rehydrate = new java.util.HashSet<>();
+        java.util.Set<org.bukkit.entity.LivingEntity> extinguish = new java.util.HashSet<>();
+        for (LivingEntity livingEntity : this.level().getEntitiesOfClass(LivingEntity.class, aabb, APPLY_WATER_GET_ENTITIES_PREDICATE)) {
+            if (livingEntity instanceof Axolotl axolotl) {
+                rehydrate.add(((org.bukkit.entity.Axolotl) axolotl.getBukkitEntity()));
+            }
+            // Paper end - Fix potions splash events
+             double d = this.distanceToSqr(livingEntity);
+             if (d < 16.0) {
+                 if (livingEntity.isSensitiveToWater()) {
+-                    livingEntity.hurtServer(level, this.damageSources().indirectMagic(this, this.getOwner()), 1.0F);
+                    affected.put(livingEntity.getBukkitLivingEntity(), 1.0);
+                    // livingEntity.hurtServer(level, this.damageSources().indirectMagic(this, this.getOwner()), 1.0F);
+                 }
+ 
+                 if (livingEntity.isOnFire() && livingEntity.isAlive()) {
+-                    livingEntity.extinguishFire();
+                    extinguish.add(livingEntity.getBukkitLivingEntity());
+                    // livingEntity.extinguishFire();
+                 }
+             }
+         }
+ 
+-        for (Axolotl axolotl : this.level().getEntitiesOfClass(Axolotl.class, aabb)) {
+-            axolotl.rehydrate();
+        io.papermc.paper.event.entity.WaterBottleSplashEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callWaterBottleSplashEvent(
+            this, result, affected, rehydrate, extinguish
+        );
+        if (!event.isCancelled()) {
+            for (org.bukkit.entity.LivingEntity affectedEntity : event.getToDamage()) {
+                ((org.bukkit.craftbukkit.entity.CraftLivingEntity) affectedEntity).getHandle().hurtServer(level, this.damageSources().indirectMagic(this, this.getOwner()), 1.0F);
+            }
+            for (org.bukkit.entity.LivingEntity toExtinguish : event.getToExtinguish()) {
+                ((org.bukkit.craftbukkit.entity.CraftLivingEntity) toExtinguish).getHandle().extinguishFire();
+            }
+            for (org.bukkit.entity.LivingEntity toRehydrate : event.getToRehydrate()) {
+                if (((org.bukkit.craftbukkit.entity.CraftLivingEntity) toRehydrate).getHandle() instanceof Axolotl axolotl) {
+                    axolotl.rehydrate();
+                }
+            }
+            // Paper end - Fix potions splash events
+         }
+        return !event.isCancelled(); // Paper - Fix potions splash events
+     }
+ 
+-    private void applySplash(ServerLevel level, Iterable<MobEffectInstance> effects, @Nullable Entity entity) {
+    private boolean applySplash(ServerLevel level, Iterable<MobEffectInstance> effects, @Nullable Entity entity, @Nullable HitResult result) { // CraftBukkit - Pass MovingObjectPosition // Paper - Fix potions splash events & More projectile API
+         AABB aabb = this.getBoundingBox().inflate(4.0, 2.0, 4.0);
+         List<LivingEntity> entitiesOfClass = level.getEntitiesOfClass(LivingEntity.class, aabb);
+        java.util.Map<org.bukkit.entity.LivingEntity, Double> affected = new java.util.HashMap<>(); // CraftBukkit
+         if (!entitiesOfClass.isEmpty()) {
+             Entity effectSource = this.getEffectSource();
+ 
+@@ -135,33 +_,57 @@
+                     double d = this.distanceToSqr(livingEntity);
+                     if (d < 16.0) {
+                         double d1;
+                        // Paper - diff on change, used when calling the splash event for water splash potions
+                         if (livingEntity == entity) {
+                             d1 = 1.0;
+                         } else {
+                             d1 = 1.0 - Math.sqrt(d) / 4.0;
+                         }
+ 
+-                        for (MobEffectInstance mobEffectInstance : effects) {
+-                            Holder<MobEffect> effect = mobEffectInstance.getEffect();
+-                            if (effect.value().isInstantenous()) {
+-                                effect.value().applyInstantenousEffect(level, this, this.getOwner(), livingEntity, mobEffectInstance.getAmplifier(), d1);
+-                            } else {
+-                                int i = mobEffectInstance.mapDuration(i1 -> (int)(d1 * i1 + 0.5));
+-                                MobEffectInstance mobEffectInstance1 = new MobEffectInstance(
+-                                    effect, i, mobEffectInstance.getAmplifier(), mobEffectInstance.isAmbient(), mobEffectInstance.isVisible()
+-                                );
+-                                if (!mobEffectInstance1.endsWithin(20)) {
+-                                    livingEntity.addEffect(mobEffectInstance1, effectSource);
+-                                }
+-                            }
+-                        }
+-                    }
+-                }
+-            }
+-        }
+                        affected.put(livingEntity.getBukkitLivingEntity(), d1);
+                    }
+                }
+            }
+        }
+        org.bukkit.event.entity.PotionSplashEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPotionSplashEvent(this, result, affected);
+        if (!event.isCancelled() && entitiesOfClass != null && !entitiesOfClass.isEmpty()) { // do not process effects if there are no effects to process
+            Entity effectSource = this.getEffectSource();
+            for (org.bukkit.entity.LivingEntity victim : event.getAffectedEntities()) {
+                if (!(victim instanceof org.bukkit.craftbukkit.entity.CraftLivingEntity craftLivingEntity)) {
+                    continue;
+                }
+                net.minecraft.world.entity.LivingEntity livingEntity = craftLivingEntity.getHandle();
+                double d1 = event.getIntensity(victim);
+                // CraftBukkit end
+                for (MobEffectInstance mobEffectInstance : effects) {
+                    Holder<MobEffect> effect = mobEffectInstance.getEffect();
+                    // CraftBukkit start - Abide by PVP settings - for players only!
+                    if (!this.level().pvpMode && this.getOwner() instanceof ServerPlayer && livingEntity instanceof ServerPlayer && livingEntity != this.getOwner()) {
+                        MobEffect mobEffect = effect.value();
+                        if (mobEffect == net.minecraft.world.effect.MobEffects.MOVEMENT_SLOWDOWN || mobEffect == net.minecraft.world.effect.MobEffects.DIG_SLOWDOWN || mobEffect == net.minecraft.world.effect.MobEffects.HARM || mobEffect == net.minecraft.world.effect.MobEffects.BLINDNESS
+                                || mobEffect == net.minecraft.world.effect.MobEffects.HUNGER || mobEffect == net.minecraft.world.effect.MobEffects.WEAKNESS || mobEffect == net.minecraft.world.effect.MobEffects.POISON) {
+                            continue;
+                        }
+                    }
+                    // CraftBukkit end
+                    if (effect.value().isInstantenous()) {
+                        effect.value().applyInstantenousEffect(level, this, this.getOwner(), livingEntity, mobEffectInstance.getAmplifier(), d1);
+                    } else {
+                        int i = mobEffectInstance.mapDuration(i1 -> (int)(d1 * i1 + 0.5));
+                        MobEffectInstance mobEffectInstance1 = new MobEffectInstance(
+                            effect, i, mobEffectInstance.getAmplifier(), mobEffectInstance.isAmbient(), mobEffectInstance.isVisible()
+                        );
+                        if (!mobEffectInstance1.endsWithin(20)) {
+                            livingEntity.addEffect(mobEffectInstance1, effectSource);
+                        }
+                    }
+                }
+            }
+        }
+        return !event.isCancelled(); // Paper - Fix potions splash events
+     }
+ 
+-    private void makeAreaOfEffectCloud(PotionContents potionContents) {
+    private boolean makeAreaOfEffectCloud(PotionContents potionContents, @Nullable HitResult result) { // CraftBukkit - Pass MovingObjectPosition // Paper - More projectile API
+         AreaEffectCloud areaEffectCloud = new AreaEffectCloud(this.level(), this.getX(), this.getY(), this.getZ());
+         if (this.getOwner() instanceof LivingEntity livingEntity) {
+             areaEffectCloud.setOwner(livingEntity);
+@@ -172,7 +_,16 @@
+         areaEffectCloud.setWaitTime(10);
+         areaEffectCloud.setRadiusPerTick(-areaEffectCloud.getRadius() / areaEffectCloud.getDuration());
+         areaEffectCloud.setPotionContents(potionContents);
+-        this.level().addFreshEntity(areaEffectCloud);
+        boolean noEffects = potionContents.hasEffects(); // Paper - Fix potions splash events
+        // CraftBukkit start
+        org.bukkit.event.entity.LingeringPotionSplashEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callLingeringPotionSplashEvent(this, result, areaEffectCloud);
+        if (!(event.isCancelled() || areaEffectCloud.isRemoved() || (!event.allowsEmptyCreation() && (noEffects && !areaEffectCloud.potionContents.hasEffects())))) { // Paper - don't spawn area effect cloud if the effects were empty and not changed during the event handling
+            this.level().addFreshEntity(areaEffectCloud);
+        } else {
+            areaEffectCloud.discard(null); // CraftBukkit - add Bukkit remove cause
+        }
+        // CraftBukkit end
+        return !event.isCancelled(); // Paper - Fix potions splash events
+     }
+ 
+     public boolean isLingering() {
+@@ -182,13 +_,25 @@
+     private void dowseFire(BlockPos pos) {
+         BlockState blockState = this.level().getBlockState(pos);
+         if (blockState.is(BlockTags.FIRE)) {
+-            this.level().destroyBlock(pos, false, this);
+            // CraftBukkit start
+            if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this, pos, blockState.getFluidState().createLegacyBlock())) { // Paper - fix wrong block state
+                this.level().destroyBlock(pos, false, this);
+            }
+            // CraftBukkit end
+         } else if (AbstractCandleBlock.isLit(blockState)) {
+-            AbstractCandleBlock.extinguish(null, blockState, this.level(), pos);
+            // CraftBukkit start
+            if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this, pos, blockState.setValue(AbstractCandleBlock.LIT, false))) {
+                AbstractCandleBlock.extinguish(null, blockState, this.level(), pos);
+            }
+            // CraftBukkit end
+         } else if (CampfireBlock.isLitCampfire(blockState)) {
+-            this.level().levelEvent(null, 1009, pos, 0);
+-            CampfireBlock.dowse(this.getOwner(), this.level(), pos, blockState);
+-            this.level().setBlockAndUpdate(pos, blockState.setValue(CampfireBlock.LIT, Boolean.valueOf(false)));
+            // CraftBukkit start
+            if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this, pos, blockState.setValue(CampfireBlock.LIT, false))) {
+                this.level().levelEvent(null, 1009, pos, 0);
+                CampfireBlock.dowse(this.getOwner(), this.level(), pos, blockState);
+                this.level().setBlockAndUpdate(pos, blockState.setValue(CampfireBlock.LIT, false));
+            }
+            // CraftBukkit end
+         }
+     }
+ 
--- a/paper-server/patches/sources/net/minecraft/world/entity/projectile/ThrownTrident.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/projectile/ThrownTrident.java.patch
@@ -0,0 +1,65 @@
+--- a/net/minecraft/world/entity/projectile/ThrownTrident.java
+++ b/net/minecraft/world/entity/projectile/ThrownTrident.java
+@@ -32,16 +_,19 @@
+ 
+     public ThrownTrident(EntityType<? extends ThrownTrident> entityType, Level level) {
+         super(entityType, level);
+        this.setBaseDamage(net.minecraft.world.item.TridentItem.BASE_DAMAGE); // Paper - Allow trident custom damage
+     }
+ 
+     public ThrownTrident(Level level, LivingEntity shooter, ItemStack pickupItemStack) {
+         super(EntityType.TRIDENT, shooter, level, pickupItemStack, null);
+        this.setBaseDamage(net.minecraft.world.item.TridentItem.BASE_DAMAGE); // Paper - Allow trident custom damage
+         this.entityData.set(ID_LOYALTY, this.getLoyaltyFromItem(pickupItemStack));
+         this.entityData.set(ID_FOIL, pickupItemStack.hasFoil());
+     }
+ 
+     public ThrownTrident(Level level, double x, double y, double z, ItemStack pickupItemStack) {
+         super(EntityType.TRIDENT, x, y, z, level, pickupItemStack, pickupItemStack);
+        this.setBaseDamage(net.minecraft.world.item.TridentItem.BASE_DAMAGE); // Paper - Allow trident custom damage
+         this.entityData.set(ID_LOYALTY, this.getLoyaltyFromItem(pickupItemStack));
+         this.entityData.set(ID_FOIL, pickupItemStack.hasFoil());
+     }
+@@ -67,10 +_,10 @@
+                     this.spawnAtLocation(serverLevel, this.getPickupItem(), 0.1F);
+                 }
+ 
+-                this.discard();
+                this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DROP); // CraftBukkit - add Bukkit remove cause
+             } else {
+                 if (!(owner instanceof Player) && this.position().distanceTo(owner.getEyePosition()) < owner.getBbWidth() + 1.0) {
+-                    this.discard();
+                    this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
+                     return;
+                 }
+ 
+@@ -99,6 +_,20 @@
+         return this.entityData.get(ID_FOIL);
+     }
+ 
+    // Paper start
+    public void setFoil(boolean foil) {
+        this.entityData.set(ThrownTrident.ID_FOIL, foil);
+    }
+
+    public int getLoyalty() {
+        return this.entityData.get(ThrownTrident.ID_LOYALTY);
+    }
+
+    public void setLoyalty(byte loyalty) {
+        this.entityData.set(ThrownTrident.ID_LOYALTY, loyalty);
+    }
+    // Paper end
+
+     @Nullable
+     @Override
+     protected EntityHitResult findHitEntity(Vec3 startVec, Vec3 endVec) {
+@@ -108,7 +_,7 @@
+     @Override
+     protected void onHitEntity(EntityHitResult result) {
+         Entity entity = result.getEntity();
+-        float f = 8.0F;
+        float f = (float) this.getBaseDamage(); // Paper - Allow trident custom damage
+         Entity owner = this.getOwner();
+         DamageSource damageSource = this.damageSources().trident(this, (Entity)(owner == null ? this : owner));
+         if (this.level() instanceof ServerLevel serverLevel) {
--- a/paper-server/patches/sources/net/minecraft/world/entity/projectile/WitherSkull.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/projectile/WitherSkull.java.patch
@@ -0,0 +1,43 @@
+--- a/net/minecraft/world/entity/projectile/WitherSkull.java
+++ b/net/minecraft/world/entity/projectile/WitherSkull.java
+@@ -65,11 +_,11 @@
+                     if (var8.isAlive()) {
+                         EnchantmentHelper.doPostAttackEffects(serverLevel, var8, damageSource);
+                     } else {
+-                        livingEntity.heal(5.0F);
+                        livingEntity.heal(5.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.WITHER); // CraftBukkit
+                     }
+                 }
+             } else {
+-                flag = var8.hurtServer(serverLevel, this.damageSources().magic(), 5.0F);
+                flag = var8.hurtServer(serverLevel, this.damageSources().magic().customEventDamager(this), 5.0F); // Paper - Fire EntityDamageByEntityEvent for unowned wither skulls // Paper - fix DamageSource API
+             }
+ 
+             if (flag && var8 instanceof LivingEntity livingEntityx) {
+@@ -81,7 +_,7 @@
+                 }
+ 
+                 if (i > 0) {
+-                    livingEntityx.addEffect(new MobEffectInstance(MobEffects.WITHER, 20 * i, 1), this.getEffectSource());
+                    livingEntityx.addEffect(new MobEffectInstance(MobEffects.WITHER, 20 * i, 1), this.getEffectSource(), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.ATTACK); // CraftBukkit
+                 }
+             }
+         }
+@@ -91,8 +_,15 @@
+     protected void onHit(HitResult result) {
+         super.onHit(result);
+         if (!this.level().isClientSide) {
+-            this.level().explode(this, this.getX(), this.getY(), this.getZ(), 1.0F, false, Level.ExplosionInteraction.MOB);
+-            this.discard();
+            // CraftBukkit start
+            org.bukkit.event.entity.ExplosionPrimeEvent event = new org.bukkit.event.entity.ExplosionPrimeEvent(this.getBukkitEntity(), 1.0F, false);
+            this.level().getCraftServer().getPluginManager().callEvent(event);
+
+            if (!event.isCancelled()) {
+                this.level().explode(this, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), Level.ExplosionInteraction.MOB);
+            }
+            // CraftBukkit end
+            this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.HIT); // CraftBukkit - add Bukkit remove cause
+         }
+     }
+