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();

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

@@ -1,12 +1,13 @@
 --- a/net/minecraft/world/entity/animal/EntityDolphin.java
 +++ b/net/minecraft/world/entity/animal/EntityDolphin.java
-@@ -61,8 +61,19 @@
+@@ -61,8 +61,20 @@
  import net.minecraft.world.level.pathfinder.PathMode;
  import net.minecraft.world.phys.Vec3D;
  
 +// CraftBukkit start
 +import org.bukkit.craftbukkit.event.CraftEventFactory;
 +import org.bukkit.event.entity.EntityPotionEffectEvent;
++import org.bukkit.event.entity.EntityRemoveEvent;
 +// CraftBukkit end
 +
  public class EntityDolphin extends EntityWaterAnimal {
@@ -20,7 +21,7 @@
      private static final DataWatcherObject<BlockPosition> TREASURE_POS = DataWatcher.defineId(EntityDolphin.class, DataWatcherRegistry.BLOCK_POS);
      private static final DataWatcherObject<Boolean> GOT_FISH = DataWatcher.defineId(EntityDolphin.class, DataWatcherRegistry.BOOLEAN);
      private static final DataWatcherObject<Integer> MOISTNESS_LEVEL = DataWatcher.defineId(EntityDolphin.class, DataWatcherRegistry.INT);
-@@ -185,7 +196,7 @@
+@@ -185,7 +197,7 @@
  
      @Override
      public int getMaxAirSupply() {
@@ -29,7 +30,7 @@
      }
  
      @Override
-@@ -226,6 +237,12 @@
+@@ -226,11 +238,17 @@
              ItemStack itemstack = entityitem.getItem();
  
              if (this.canHoldItem(itemstack)) {
@@ -42,7 +43,13 @@
                  this.onItemPickup(entityitem);
                  this.setItemSlot(EnumItemSlot.MAINHAND, itemstack);
                  this.setGuaranteedDrop(EnumItemSlot.MAINHAND);
-@@ -484,7 +501,7 @@
+                 this.take(entityitem, itemstack.getCount());
+-                entityitem.discard();
++                entityitem.discard(EntityRemoveEvent.Cause.PICKUP); // CraftBukkit - add Bukkit remove cause
+             }
+         }
+ 
+@@ -484,7 +502,7 @@
  
          @Override
          public void start() {
@@ -51,7 +58,7 @@
          }
  
          @Override
-@@ -503,7 +520,7 @@
+@@ -503,7 +521,7 @@
              }
  
              if (this.player.isSwimming() && this.player.level().random.nextInt(6) == 0) {

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

@@ -1,6 +1,17 @@
 --- a/net/minecraft/world/entity/animal/EntityFox.java
 +++ b/net/minecraft/world/entity/animal/EntityFox.java
-@@ -523,7 +523,8 @@
+@@ -94,6 +94,10 @@
+ import net.minecraft.world.phys.Vec3D;
+ import org.joml.Vector3f;
+ 
++// CraftBukkit start
++import org.bukkit.event.entity.EntityRemoveEvent;
++// CraftBukkit end
++
+ public class EntityFox extends EntityAnimal implements VariantHolder<EntityFox.Type> {
+ 
+     private static final DataWatcherObject<Integer> DATA_TYPE_ID = DataWatcher.defineId(EntityFox.class, DataWatcherRegistry.INT);
+@@ -523,7 +527,8 @@
      protected void pickUpItem(EntityItem entityitem) {
          ItemStack itemstack = entityitem.getItem();
  
@@ -10,7 +21,16 @@
              int i = itemstack.getCount();
  
              if (i > 1) {
-@@ -883,6 +884,16 @@
+@@ -535,7 +540,7 @@
+             this.setItemSlot(EnumItemSlot.MAINHAND, itemstack.split(1));
+             this.setGuaranteedDrop(EnumItemSlot.MAINHAND);
+             this.take(entityitem, itemstack.getCount());
+-            entityitem.discard();
++            entityitem.discard(EntityRemoveEvent.Cause.PICKUP); // CraftBukkit - add Bukkit remove cause
+             this.ticksSinceEaten = 0;
+         }
+ 
+@@ -883,6 +888,16 @@
                  if (entityplayer1 != null && entityplayer != entityplayer1) {
                      entityfox.addTrustedUUID(entityplayer1.getUUID());
                  }
@@ -27,7 +47,7 @@
  
                  if (entityplayer2 != null) {
                      entityplayer2.awardStat(StatisticList.ANIMALS_BRED);
-@@ -893,12 +904,14 @@
+@@ -893,12 +908,14 @@
                  this.partner.setAge(6000);
                  this.animal.resetLove();
                  this.partner.resetLove();
@@ -46,7 +66,7 @@
                  }
  
              }
-@@ -1294,6 +1307,11 @@
+@@ -1294,6 +1311,11 @@
              int i = (Integer) iblockdata.getValue(BlockSweetBerryBush.AGE);
  
              iblockdata.setValue(BlockSweetBerryBush.AGE, 1);
@@ -58,7 +78,7 @@
              int j = 1 + EntityFox.this.level().random.nextInt(2) + (i == 3 ? 1 : 0);
              ItemStack itemstack = EntityFox.this.getItemBySlot(EnumItemSlot.MAINHAND);
  
-@@ -1451,7 +1469,7 @@
+@@ -1451,7 +1473,7 @@
          private EntityLiving trustedLastHurt;
          private int timestamp;
  

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/animal/EntityMushroomCow.java
 +++ b/net/minecraft/world/entity/animal/EntityMushroomCow.java
-@@ -42,13 +42,20 @@
+@@ -42,13 +42,21 @@
  import net.minecraft.world.level.block.state.IBlockData;
  import net.minecraft.world.level.gameevent.GameEvent;
  
@@ -8,6 +8,7 @@
 +import org.bukkit.Bukkit;
 +import org.bukkit.craftbukkit.event.CraftEventFactory;
 +import org.bukkit.event.entity.EntityDropItemEvent;
++import org.bukkit.event.entity.EntityRemoveEvent;
 +import org.bukkit.event.entity.EntityTransformEvent;
 +// CraftBukkit end
 +
@@ -22,7 +23,7 @@
      @Nullable
      private UUID lastLightningBoltUUID;
  
-@@ -114,6 +121,11 @@
+@@ -114,6 +122,11 @@
              this.playSound(soundeffect, 1.0F, 1.0F);
              return EnumInteractionResult.sidedSuccess(this.level().isClientSide);
          } else if (itemstack.is(Items.SHEARS) && this.readyForShearing()) {
@@ -34,7 +35,7 @@
              this.shear(SoundCategory.PLAYERS);
              this.gameEvent(GameEvent.SHEAR, entityhuman);
              if (!this.level().isClientSide) {
-@@ -161,7 +173,7 @@
+@@ -161,7 +174,7 @@
  
              if (entitycow != null) {
                  ((WorldServer) this.level()).sendParticles(Particles.EXPLOSION, this.getX(), this.getY(0.5D), this.getZ(), 1, 0.0D, 0.0D, 0.0D, 0.0D);
@@ -43,7 +44,7 @@
                  entitycow.moveTo(this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
                  entitycow.setHealth(this.getHealth());
                  entitycow.yBodyRot = this.yBodyRot;
-@@ -175,10 +187,25 @@
+@@ -175,10 +188,25 @@
                  }
  
                  entitycow.setInvulnerable(this.isInvulnerable());
@@ -54,7 +55,7 @@
 +                }
 +                this.level().addFreshEntity(entitycow, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SHEARED);
 +
-+                this.discard(); // CraftBukkit - from above
++                this.discard(EntityRemoveEvent.Cause.TRANSFORMATION); // CraftBukkit - from above and add Bukkit remove cause
 +                // CraftBukkit end
  
                  for (int i = 0; i < 5; ++i) {

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

@@ -1,18 +1,19 @@
 --- a/net/minecraft/world/entity/animal/EntityPanda.java
 +++ b/net/minecraft/world/entity/animal/EntityPanda.java
-@@ -67,6 +67,11 @@
+@@ -67,6 +67,12 @@
  import net.minecraft.world.phys.Vec3D;
  import org.joml.Vector3f;
  
 +// CraftBukkit start;
 +import org.bukkit.craftbukkit.event.CraftEventFactory;
++import org.bukkit.event.entity.EntityRemoveEvent;
 +import org.bukkit.event.entity.EntityTargetEvent;
 +// CraftBukkit end
 +
  public class EntityPanda extends EntityAnimal {
  
      private static final DataWatcherObject<Integer> UNHAPPY_COUNTER = DataWatcher.defineId(EntityPanda.class, DataWatcherRegistry.INT);
-@@ -534,7 +539,7 @@
+@@ -534,14 +540,14 @@
  
      @Override
      protected void pickUpItem(EntityItem entityitem) {
@@ -21,7 +22,15 @@
              this.onItemPickup(entityitem);
              ItemStack itemstack = entityitem.getItem();
  
-@@ -870,10 +875,10 @@
+             this.setItemSlot(EnumItemSlot.MAINHAND, itemstack);
+             this.setGuaranteedDrop(EnumItemSlot.MAINHAND);
+             this.take(entityitem, itemstack.getCount());
+-            entityitem.discard();
++            entityitem.discard(EntityRemoveEvent.Cause.PICKUP); // CraftBukkit - add Bukkit remove cause
+         }
+ 
+     }
+@@ -870,10 +876,10 @@
          private final EntityPanda panda;
  
          public c(EntityPanda entitypanda, Class<T> oclass, float f, double d0, double d1) {
@@ -35,7 +44,7 @@
              this.panda = entitypanda;
          }
  
-@@ -1112,7 +1117,7 @@
+@@ -1112,7 +1118,7 @@
          @Override
          protected void alertOther(EntityInsentient entityinsentient, EntityLiving entityliving) {
              if (entityinsentient instanceof EntityPanda && entityinsentient.isAggressive()) {

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

@@ -0,0 +1,22 @@
+--- a/net/minecraft/world/entity/animal/EntityPerchable.java
++++ b/net/minecraft/world/entity/animal/EntityPerchable.java
+@@ -6,6 +6,10 @@
+ import net.minecraft.world.entity.EntityTypes;
+ import net.minecraft.world.level.World;
+ 
++// CraftBukkit start
++import org.bukkit.event.entity.EntityRemoveEvent;
++// CraftBukkit end
++
+ public abstract class EntityPerchable extends EntityTameableAnimal {
+ 
+     private static final int RIDE_COOLDOWN = 100;
+@@ -21,7 +25,7 @@
+         nbttagcompound.putString("id", this.getEncodeId());
+         this.saveWithoutId(nbttagcompound);
+         if (entityplayer.setEntityOnShoulder(nbttagcompound)) {
+-            this.discard();
++            this.discard(EntityRemoveEvent.Cause.PICKUP); // CraftBukkit - add Bukkit remove cause
+             return true;
+         } else {
+             return false;

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

@@ -1,21 +1,23 @@
 --- a/net/minecraft/world/entity/animal/EntityPig.java
 +++ b/net/minecraft/world/entity/animal/EntityPig.java
-@@ -51,6 +51,10 @@
+@@ -51,6 +51,11 @@
  import net.minecraft.world.phys.Vec3D;
  import org.joml.Vector3f;
  
 +// CraftBukkit start
 +import org.bukkit.craftbukkit.event.CraftEventFactory;
++import org.bukkit.event.entity.EntityRemoveEvent;
 +// CraftBukkit end
 +
  public class EntityPig extends EntityAnimal implements ISteerable, ISaddleable {
  
      private static final DataWatcherObject<Boolean> DATA_SADDLE_ID = DataWatcher.defineId(EntityPig.class, DataWatcherRegistry.BOOLEAN);
-@@ -252,7 +256,13 @@
+@@ -252,8 +257,14 @@
                  }
  
                  entitypigzombie.setPersistenceRequired();
 -                worldserver.addFreshEntity(entitypigzombie);
+-                this.discard();
 +                // CraftBukkit start
 +                if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
 +                    return;
@@ -23,6 +25,7 @@
 +                // CraftBukkit - added a reason for spawning this creature
 +                worldserver.addFreshEntity(entitypigzombie, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING);
 +                // CraftBukkit end
-                 this.discard();
++                this.discard(EntityRemoveEvent.Cause.TRANSFORMATION); // CraftBukkit - add Bukkit remove cause
              } else {
                  super.thunderHit(worldserver, entitylightning);
+             }

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

@@ -0,0 +1,40 @@
+--- a/net/minecraft/world/entity/animal/frog/ShootTongue.java
++++ b/net/minecraft/world/entity/animal/frog/ShootTongue.java
+@@ -20,6 +20,10 @@
+ import net.minecraft.world.level.pathfinder.PathEntity;
+ import net.minecraft.world.phys.Vec3D;
+ 
++// CraftBukkit start
++import org.bukkit.event.entity.EntityRemoveEvent;
++// CraftBukkit end
++
+ public class ShootTongue extends Behavior<Frog> {
+ 
+     public static final int TIME_OUT_DURATION = 100;
+@@ -64,7 +68,7 @@
+ 
+         BehaviorUtil.lookAtEntity(frog, entityliving);
+         frog.setTongueTarget(entityliving);
+-        frog.getBrain().setMemory(MemoryModuleType.WALK_TARGET, (Object) (new MemoryTarget(entityliving.position(), 2.0F, 0)));
++        frog.getBrain().setMemory(MemoryModuleType.WALK_TARGET, (new MemoryTarget(entityliving.position(), 2.0F, 0))); // CraftBukkit - decompile error
+         this.calculatePathCounter = 10;
+         this.state = ShootTongue.a.MOVE_TO_TARGET;
+     }
+@@ -85,7 +89,7 @@
+             if (entity.isAlive()) {
+                 frog.doHurtTarget(entity);
+                 if (!entity.isAlive()) {
+-                    entity.remove(Entity.RemovalReason.KILLED);
++                    entity.remove(Entity.RemovalReason.KILLED, EntityRemoveEvent.Cause.DEATH); // CraftBukkit - add Bukkit remove cause
+                 }
+             }
+         }
+@@ -106,7 +110,7 @@
+                     this.eatAnimationTimer = 0;
+                     this.state = ShootTongue.a.CATCH_ANIMATION;
+                 } else if (this.calculatePathCounter <= 0) {
+-                    frog.getBrain().setMemory(MemoryModuleType.WALK_TARGET, (Object) (new MemoryTarget(entityliving.position(), 2.0F, 0)));
++                    frog.getBrain().setMemory(MemoryModuleType.WALK_TARGET, (new MemoryTarget(entityliving.position(), 2.0F, 0))); // CraftBukkit - decompile error
+                     this.calculatePathCounter = 10;
+                 } else {
+                     --this.calculatePathCounter;

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

@@ -1,6 +1,17 @@
 --- a/net/minecraft/world/entity/animal/frog/Tadpole.java
 +++ b/net/minecraft/world/entity/animal/frog/Tadpole.java
-@@ -68,7 +68,7 @@
+@@ -35,6 +35,10 @@
+ import net.minecraft.world.item.Items;
+ import net.minecraft.world.level.World;
+ 
++// CraftBukkit start
++import org.bukkit.event.entity.EntityRemoveEvent;
++// CraftBukkit end
++
+ public class Tadpole extends EntityFish {
+ 
+     @VisibleForTesting
+@@ -68,7 +72,7 @@
  
      @Override
      public BehaviorController<Tadpole> getBrain() {
@@ -9,7 +20,7 @@
      }
  
      @Override
-@@ -233,8 +233,14 @@
+@@ -233,9 +237,15 @@
                  }
  
                  frog.setPersistenceRequired();
@@ -21,7 +32,9 @@
 +                // CraftBukkit end
                  this.playSound(SoundEffects.TADPOLE_GROW_UP, 0.15F, 1.0F);
 -                worldserver.addFreshEntityWithPassengers(frog);
+-                this.discard();
 +                worldserver.addFreshEntityWithPassengers(frog, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.METAMORPHOSIS); // CraftBukkit - add SpawnReason
-                 this.discard();
++                this.discard(EntityRemoveEvent.Cause.TRANSFORMATION); // CraftBukkit - add Bukkit remove cause
              }
          }
+ 

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

@@ -0,0 +1,22 @@
+--- a/net/minecraft/world/entity/animal/horse/EntityHorseSkeleton.java
++++ b/net/minecraft/world/entity/animal/horse/EntityHorseSkeleton.java
+@@ -27,6 +27,10 @@
+ import net.minecraft.world.level.World;
+ import org.joml.Vector3f;
+ 
++// CraftBukkit start
++import org.bukkit.event.entity.EntityRemoveEvent;
++// CraftBukkit end
++
+ public class EntityHorseSkeleton extends EntityHorseAbstract {
+ 
+     private final PathfinderGoalHorseTrap skeletonTrapGoal = new PathfinderGoalHorseTrap(this);
+@@ -126,7 +130,7 @@
+     public void aiStep() {
+         super.aiStep();
+         if (this.isTrap() && this.trapTime++ >= 18000) {
+-            this.discard();
++            this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
+         }
+ 
+     }

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

@@ -1,6 +1,26 @@
 --- a/net/minecraft/world/entity/animal/horse/EntityLlamaTrader.java
 +++ b/net/minecraft/world/entity/animal/horse/EntityLlamaTrader.java
-@@ -153,7 +153,7 @@
+@@ -19,6 +19,10 @@
+ import net.minecraft.world.level.World;
+ import net.minecraft.world.level.WorldAccess;
+ 
++// CraftBukkit start
++import org.bukkit.event.entity.EntityRemoveEvent;
++// CraftBukkit end
++
+ public class EntityLlamaTrader extends EntityLlama {
+ 
+     private int despawnDelay = 47999;
+@@ -87,7 +91,7 @@
+             this.despawnDelay = this.isLeashedToWanderingTrader() ? ((EntityVillagerTrader) this.getLeashHolder()).getDespawnDelay() - 1 : this.despawnDelay - 1;
+             if (this.despawnDelay <= 0) {
+                 this.dropLeash(true, false);
+-                this.discard();
++                this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
+             }
+ 
+         }
+@@ -153,7 +157,7 @@
  
          @Override
          public void start() {