More work

gradle.properties

@@ -4,7 +4,6 @@ mcVersion=1.21.4
 
 # Set to true while updating Minecraft version
 updatingMinecraft=false
-cleanPaperRepo=~/IdeaProjects/Paper/Paper-Server/src/main/java
 updateTaskListIssue=https://github.com/PaperMC/Paper/issues/11736
 
 org.gradle.configuration-cache=true

paper-server/patches/sources/net/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.java
 +++ b/net/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.java
-@@ -61,7 +61,7 @@
+@@ -48,7 +_,7 @@
  
      @Override
      public void start() {

paper-server/patches/sources/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.java
 +++ b/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.java
-@@ -67,7 +67,7 @@
+@@ -59,7 +_,7 @@
  
      @Override
      public void start() {
@@ -9,7 +9,7 @@
          this.targetMob = this.mob.getTarget();
          this.timestamp = this.mob.getLastHurtByMobTimestamp();
          this.unseenMemoryTicks = 300;
-@@ -114,6 +114,6 @@
+@@ -114,6 +_,6 @@
      }
  
      protected void alertOther(Mob mob, LivingEntity target) {

paper-server/patches/sources/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.java
 +++ b/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.java
-@@ -70,7 +70,7 @@
+@@ -73,7 +_,7 @@
  
      @Override
      public void start() {

paper-server/patches/sources/net/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.java.patch

@@ -1,11 +1,11 @@
 --- a/net/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.java
 +++ b/net/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.java
-@@ -38,7 +38,7 @@
+@@ -37,7 +_,7 @@
  
      @Override
      public void start() {
 -        this.mob.setTarget(this.ownerLastHurtBy);
 +        this.mob.setTarget(this.ownerLastHurtBy, org.bukkit.event.entity.EntityTargetEvent.TargetReason.TARGET_ATTACKED_OWNER, true); // CraftBukkit - reason
-         LivingEntity entityliving = this.tameAnimal.getOwner();
+         LivingEntity owner = this.tameAnimal.getOwner();
- 
+         if (owner != null) {
-         if (entityliving != null) {
+             this.timestamp = owner.getLastHurtByMobTimestamp();

paper-server/patches/sources/net/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.java.patch

@@ -1,11 +1,11 @@
 --- a/net/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.java
 +++ b/net/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.java
-@@ -38,7 +38,7 @@
+@@ -37,7 +_,7 @@
  
      @Override
      public void start() {
 -        this.mob.setTarget(this.ownerLastHurt);
 +        this.mob.setTarget(this.ownerLastHurt, org.bukkit.event.entity.EntityTargetEvent.TargetReason.OWNER_ATTACKED_TARGET, true); // CraftBukkit - reason
-         LivingEntity entityliving = this.tameAnimal.getOwner();
+         LivingEntity owner = this.tameAnimal.getOwner();
- 
+         if (owner != null) {
-         if (entityliving != null) {
+             this.timestamp = owner.getLastHurtMobTimestamp();

paper-server/patches/sources/net/minecraft/world/entity/ai/goal/target/TargetGoal.java.patch

@@ -0,0 +1,20 @@
+--- a/net/minecraft/world/entity/ai/goal/target/TargetGoal.java
++++ b/net/minecraft/world/entity/ai/goal/target/TargetGoal.java
+@@ -63,7 +_,7 @@
+                         }
+                     }
+ 
+-                    this.mob.setTarget(target);
++                    this.mob.setTarget(target, org.bukkit.event.entity.EntityTargetEvent.TargetReason.CLOSEST_ENTITY, true); // CraftBukkit
+                     return true;
+                 }
+             }
+@@ -83,7 +_,7 @@
+ 
+     @Override
+     public void stop() {
+-        this.mob.setTarget(null);
++        this.mob.setTarget((LivingEntity) null, org.bukkit.event.entity.EntityTargetEvent.TargetReason.FORGOT_TARGET, true); // CraftBukkit
+         this.targetMob = null;
+     }
+ 

paper-server/patches/unapplied/net/minecraft/world/entity/ai/goal/target/TargetGoal.java.patch

@@ -1,30 +0,0 @@
---- a/net/minecraft/world/entity/ai/goal/target/TargetGoal.java
-+++ b/net/minecraft/world/entity/ai/goal/target/TargetGoal.java
-@@ -10,6 +10,9 @@
- import net.minecraft.world.level.pathfinder.Node;
- import net.minecraft.world.level.pathfinder.Path;
- import net.minecraft.world.scores.PlayerTeam;
-+// CraftBukkit start
-+import org.bukkit.event.entity.EntityTargetEvent;
-+// CraftBukkit end
- 
- public abstract class TargetGoal extends Goal {
- 
-@@ -69,7 +72,7 @@
-                         }
-                     }
- 
--                    this.mob.setTarget(entityliving);
-+                    this.mob.setTarget(entityliving, EntityTargetEvent.TargetReason.CLOSEST_ENTITY, true); // CraftBukkit
-                     return true;
-                 }
-             }
-@@ -89,7 +92,7 @@
- 
-     @Override
-     public void stop() {
--        this.mob.setTarget((LivingEntity) null);
-+        this.mob.setTarget((LivingEntity) null, EntityTargetEvent.TargetReason.FORGOT_TARGET, true); // CraftBukkit
-         this.targetMob = null;
-     }
-