1 files changed, 4 insertions, 6 deletions
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalTarget.java
index 2eb04228..c65f3dd7 100644
--- a/src/main/java/net/minecraft/server/PathfinderGoalTarget.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoalTarget.java
@@ -27,7 +27,7 @@ public abstract class PathfinderGoalTarget extends PathfinderGoal {
     }
 
     public boolean b() {
-        EntityLiving entityliving = this.d.aG();
+        EntityLiving entityliving = this.d.getGoalTarget();
 
         if (entityliving == null) {
             return false;
@@ -55,7 +55,7 @@ public abstract class PathfinderGoalTarget extends PathfinderGoal {
     }
 
     public void d() {
-        this.d.b((EntityLiving) null);
+        this.d.setGoalTarget((EntityLiving) null);
     }
 
     protected boolean a(EntityLiving entityliving, boolean flag) {
@@ -118,12 +118,10 @@ public abstract class PathfinderGoalTarget extends PathfinderGoal {
 
                 org.bukkit.event.entity.EntityTargetLivingEntityEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTargetLivingEvent(this.d, entityliving, reason);
                 if (event.isCancelled() || event.getTarget() == null) {
-                    if (this.d instanceof EntityCreature) {
-                        ((EntityCreature) this.d).target = null;
-                    }
+                    this.d.setGoalTarget(null);
                     return false;
                 } else if (entityliving.getBukkitEntity() != event.getTarget()) {
-                    this.d.b((EntityLiving) ((org.bukkit.craftbukkit.entity.CraftEntity) event.getTarget()).getHandle());
+                    this.d.setGoalTarget((EntityLiving) ((org.bukkit.craftbukkit.entity.CraftEntity) event.getTarget()).getHandle());
                 }
                 if (this.d instanceof EntityCreature) {
                     ((EntityCreature) this.d).target = ((org.bukkit.craftbukkit.entity.CraftEntity) event.getTarget()).getHandle();