SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, #1008: Add EntityRemoveEvent

By: DerFrZocker <derrieple@gmail.com>

paper-server/nms-patches/net/minecraft/world/entity/animal/Bucketable.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/animal/Bucketable.java
 +++ b/net/minecraft/world/entity/animal/Bucketable.java
-@@ -15,6 +15,14 @@
+@@ -15,6 +15,15 @@
  import net.minecraft.world.item.Items;
  import net.minecraft.world.level.World;
  
@@ -9,13 +9,14 @@
 +import net.minecraft.network.protocol.game.PacketPlayOutSpawnEntity;
 +import org.bukkit.craftbukkit.event.CraftEventFactory;
 +import org.bukkit.craftbukkit.inventory.CraftItemStack;
++import org.bukkit.event.entity.EntityRemoveEvent;
 +import org.bukkit.event.player.PlayerBucketEntityEvent;
 +// CraftBukkit end
 +
  public interface Bucketable {
  
      boolean fromBucket();
-@@ -94,10 +102,22 @@
+@@ -94,10 +103,22 @@
          ItemStack itemstack = entityhuman.getItemInHand(enumhand);
  
          if (itemstack.getItem() == Items.WATER_BUCKET && t0.isAlive()) {
@@ -39,3 +40,12 @@
              ItemStack itemstack2 = ItemLiquidUtil.createFilledResult(itemstack, entityhuman, itemstack1, false);
  
              entityhuman.setItemInHand(enumhand, itemstack2);
+@@ -107,7 +128,7 @@
+                 CriterionTriggers.FILLED_BUCKET.trigger((EntityPlayer) entityhuman, itemstack1);
+             }
+ 
+-            t0.discard();
++            t0.discard(EntityRemoveEvent.Cause.PICKUP); // CraftBukkit - add Bukkit remove cause
+             return Optional.of(EnumInteractionResult.sidedSuccess(world.isClientSide));
+         } else {
+             return Optional.empty();