Fix leash event for boats and elytra

Author: Harry Bridgen

paper-server/patches/sources/net/minecraft/world/entity/vehicle/boat/AbstractBoat.java.patch

@@ -84,14 +84,23 @@
                  this.setDeltaMovement(this.getDeltaMovement().multiply(1.0, 0.0, 1.0));
                  this.lastYd = 0.0;
              }
-@@ -708,12 +_,12 @@
+@@ -708,12 +_,20 @@
      }
 
      @Override
 -    public void remove(Entity.RemovalReason reason) {
 +    public void remove(Entity.RemovalReason reason, org.bukkit.event.entity.EntityRemoveEvent.@Nullable Cause eventCause) { // CraftBukkit - add Bukkit remove cause
          if (!this.level().isClientSide() && reason.shouldDestroy() && this.isLeashed()) {
-             this.dropLeash();
+-            this.dropLeash();
++            // Paper start - Fire EntityUnleashEvent on boat destruction
++            final org.bukkit.event.entity.EntityUnleashEvent event = new org.bukkit.event.entity.EntityUnleashEvent(this.getBukkitEntity(), org.bukkit.event.entity.EntityUnleashEvent.UnleashReason.HOLDER_GONE, true);
++            event.callEvent();
++            if (event.isDropLeash()) {
++                this.dropLeash();
++            } else {
++                this.removeLeash();
++            }
++            // Paper end - Fire EntityUnleashEvent on boat destruction
          }
 
 -        super.remove(reason);

paper-server/patches/sources/net/minecraft/world/item/FireworkRocketItem.java.patch

@@ -26,7 +26,7 @@
              }
 
              return InteractionResult.SUCCESS;
-@@ -60,13 +_,24 @@
+@@ -60,13 +_,26 @@
          if (player.isFallFlying()) {
              ItemStack itemInHand = player.getItemInHand(hand);
              if (level instanceof ServerLevel serverLevel) {
@@ -37,9 +37,11 @@
 +                com.destroystokyo.paper.event.player.PlayerElytraBoostEvent event = new com.destroystokyo.paper.event.player.PlayerElytraBoostEvent((org.bukkit.entity.Player) player.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemInHand), (org.bukkit.entity.Firework) delayed.projectile().getBukkitEntity(), org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand));
 +                if (event.callEvent() && delayed.attemptSpawn()) {
 +                    player.awardStat(Stats.ITEM_USED.get(this)); // Moved up from below
-+                    if (player.dropAllLeashConnections(null)) {
++                    // Paper start - Fire EntityUnleashEvent on elytra firework boost
++                    if (player.dropAllLeashConnections(player, hand)) {
 +                        level.playSound(null, player, SoundEvents.LEAD_BREAK, SoundSource.NEUTRAL, 1.0F, 1.0F);
 +                    }
++                    // Paper end - Fire EntityUnleashEvent on elytra firework boost
 +                    if (event.shouldConsume() && !player.hasInfiniteMaterials()) {
 +                        itemInHand.shrink(1); // Moved up from below
 +                    } else {