[Bleeding] Call EntityTargetEvent in many new places.

Adds BUKKIT-5388, BUKKIT-5387, BUKKIT-5386, BUKKIT-5483, BUKKIT-5484.
Fixes BUKKIT-5389.

1 files changed, 5 insertions, 7 deletions

diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java
index 38d14422..ec268506 100644
--- a/src/main/java/net/minecraft/server/EntityPigZombie.java
+++ b/src/main/java/net/minecraft/server/EntityPigZombie.java
@@ -83,22 +83,20 @@ public class EntityPigZombie extends EntityZombie {
                     if (entity1 instanceof EntityPigZombie) {
                         EntityPigZombie entitypigzombie = (EntityPigZombie) entity1;
 
-                        entitypigzombie.c(entity);
+                        entitypigzombie.c(entity, EntityTargetEvent.TargetReason.PIG_ZOMBIE_TARGET);
                     }
                 }
 
-                this.c(entity);
+                this.c(entity, EntityTargetEvent.TargetReason.TARGET_ATTACKED_ENTITY);
             }
 
             return super.damageEntity(damagesource, f);
         }
     }
 
-    private void c(Entity entity) {
-        // CraftBukkit start
-        org.bukkit.entity.Entity bukkitTarget = entity == null ? null : entity.getBukkitEntity();
-
-        EntityTargetEvent event = new EntityTargetEvent(this.getBukkitEntity(), bukkitTarget, EntityTargetEvent.TargetReason.PIG_ZOMBIE_TARGET);
+    // CraftBukkit start
+    private void c(Entity entity, EntityTargetEvent.TargetReason reason) { // add TargetReason
+        EntityTargetEvent event = new EntityTargetEvent(this.getBukkitEntity(), entity.getBukkitEntity(), reason);
         this.world.getServer().getPluginManager().callEvent(event);
 
         if (event.isCancelled()) {