1 files changed, 34 insertions, 49 deletions

diff --git a/src/main/java/net/minecraft/server/PathfinderGoalArrowAttack.java b/src/main/java/net/minecraft/server/PathfinderGoalArrowAttack.java
index c4838c4f..66431fb8 100644
--- a/src/main/java/net/minecraft/server/PathfinderGoalArrowAttack.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoalArrowAttack.java
@@ -4,26 +4,30 @@ import org.bukkit.event.entity.EntityTargetEvent; // CraftBukkit
 
 public class PathfinderGoalArrowAttack extends PathfinderGoal {
 
-    World a;
-    EntityLiving b;
-    EntityLiving c;
-    int d = 0;
-    float e;
-    int f = 0;
-    int g;
-    int h;
+    private final EntityLiving a;
+    private final IRangedEntity b;
+    private EntityLiving c;
+    private int d = 0;
+    private float e;
+    private int f = 0;
+    private int g;
+    private float h;
 
-    public PathfinderGoalArrowAttack(EntityLiving entityliving, float f, int i, int j) {
-        this.b = entityliving;
-        this.a = entityliving.world;
-        this.e = f;
-        this.g = i;
-        this.h = j;
-        this.a(3);
+    public PathfinderGoalArrowAttack(IRangedEntity irangedentity, float f, int i, float f1) {
+        if (!(irangedentity instanceof EntityLiving)) {
+            throw new IllegalArgumentException("ArrowAttackGoal requires Mob implements RangedAttackMob");
+        } else {
+            this.b = irangedentity;
+            this.a = (EntityLiving) irangedentity;
+            this.e = f;
+            this.g = i;
+            this.h = f1 * f1;
+            this.a(3);
+        }
     }
 
     public boolean a() {
-        EntityLiving entityliving = this.b.az();
+        EntityLiving entityliving = this.a.aF();
 
         if (entityliving == null) {
             return false;
@@ -34,21 +38,21 @@ public class PathfinderGoalArrowAttack extends PathfinderGoal {
     }
 
     public boolean b() {
-        return this.a() || !this.b.getNavigation().f();
+        return this.a() || !this.a.getNavigation().f();
     }
 
-    public void c() {
+    public void d() {
         // CraftBukkit start
         EntityTargetEvent.TargetReason reason = this.c.isAlive() ? EntityTargetEvent.TargetReason.FORGOT_TARGET : EntityTargetEvent.TargetReason.TARGET_DIED;
-        org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTargetEvent(b, null, reason);
+        org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTargetEvent((Entity) b, null, reason);
         // CraftBukkit end
         this.c = null;
+        this.f = 0;
     }
 
-    public void d() {
-        double d0 = 100.0D;
-        double d1 = this.b.e(this.c.locX, this.c.boundingBox.b, this.c.locZ);
-        boolean flag = this.b.at().canSee(this.c);
+    public void e() {
+        double d0 = this.a.e(this.c.locX, this.c.boundingBox.b, this.c.locZ);
+        boolean flag = this.a.az().canSee(this.c);
 
         if (flag) {
             ++this.f;
@@ -56,38 +60,19 @@ public class PathfinderGoalArrowAttack extends PathfinderGoal {
             this.f = 0;
         }
 
-        if (d1 <= d0 && this.f >= 20) {
-            this.b.getNavigation().g();
+        if (d0 <= (double) this.h && this.f >= 20) {
+            this.a.getNavigation().g();
         } else {
-            this.b.getNavigation().a(this.c, this.e);
+            this.a.getNavigation().a(this.c, this.e);
         }
 
-        this.b.getControllerLook().a(this.c, 30.0F, 30.0F);
+        this.a.getControllerLook().a(this.c, 30.0F, 30.0F);
         this.d = Math.max(this.d - 1, 0);
         if (this.d <= 0) {
-            if (d1 <= d0 && flag) {
-                this.f();
-                this.d = this.h;
+            if (d0 <= (double) this.h && flag) {
+                this.b.d(this.c);
+                this.d = this.g;
             }
         }
     }
-
-    private void f() {
-        if (this.g == 1) {
-            EntityArrow entityarrow = new EntityArrow(this.a, this.b, this.c, 1.6F, 12.0F);
-
-            this.a.makeSound(this.b, "random.bow", 1.0F, 1.0F / (this.b.au().nextFloat() * 0.4F + 0.8F));
-            this.a.addEntity(entityarrow);
-        } else if (this.g == 2) {
-            EntitySnowball entitysnowball = new EntitySnowball(this.a, this.b);
-            double d0 = this.c.locX - this.b.locX;
-            double d1 = this.c.locY + (double) this.c.getHeadHeight() - 1.100000023841858D - entitysnowball.locY;
-            double d2 = this.c.locZ - this.b.locZ;
-            float f = MathHelper.sqrt(d0 * d0 + d2 * d2) * 0.2F;
-
-            entitysnowball.c(d0, d1 + (double) f, d2, 1.6F, 12.0F);
-            this.a.makeSound(this.b, "random.bow", 1.0F, 1.0F / (this.b.au().nextFloat() * 0.4F + 0.8F));
-            this.a.addEntity(entitysnowball);
-        }
-    }
 }