2015-05-25 18:37:24 +08:00
|
|
|
--- a/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java
|
|
|
|
+++ b/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java
|
2016-03-01 05:32:46 +08:00
|
|
|
@@ -34,7 +34,7 @@
|
2015-02-27 06:41:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
public boolean apply(Object object) {
|
|
|
|
- return this.a((EntityLiving) object);
|
|
|
|
+ return this.a((T) object); // CraftBukkit - fix decompile error
|
|
|
|
}
|
|
|
|
};
|
|
|
|
}
|
2016-03-01 05:32:46 +08:00
|
|
|
@@ -49,11 +49,11 @@
|
|
|
|
return false;
|
|
|
|
} else {
|
|
|
|
Collections.sort(list, this.b);
|
|
|
|
- this.d = (EntityLiving) list.get(0);
|
|
|
|
+ this.d = (T) list.get(0); // CraftBukkit - fix decompile error
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
- this.d = this.e.world.a(this.e.locX, this.e.locY + (double) this.e.getHeadHeight(), this.e.locZ, this.f(), this.f(), new Function() {
|
|
|
|
+ this.d = (T) this.e.world.a(this.e.locX, this.e.locY + (double) this.e.getHeadHeight(), this.e.locZ, this.f(), this.f(), new Function<EntityHuman, Double>() { // CraftBukkit - fix decompile error
|
|
|
|
public Double a(EntityHuman entityhuman) {
|
|
|
|
ItemStack itemstack = entityhuman.getEquipment(EnumItemSlot.HEAD);
|
|
|
|
|
|
|
|
@@ -71,10 +71,10 @@
|
|
|
|
return Double.valueOf(1.0D);
|
|
|
|
}
|
|
|
|
|
|
|
|
- public Object apply(Object object) {
|
|
|
|
+ public Double apply(EntityHuman object) { // CraftBukkit - fix decompile error
|
|
|
|
return this.a((EntityHuman) object);
|
|
|
|
}
|
|
|
|
- }, this.c);
|
|
|
|
+ }, (Predicate<EntityHuman>) this.c); // CraftBukkit - fix decompile error
|
|
|
|
return this.d != null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@@ -84,7 +84,7 @@
|
2014-11-26 05:32:16 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
public void c() {
|
|
|
|
- this.e.setGoalTarget(this.d);
|
2014-12-27 20:18:31 +08:00
|
|
|
+ this.e.setGoalTarget(this.d, d instanceof EntityPlayer ? org.bukkit.event.entity.EntityTargetEvent.TargetReason.CLOSEST_PLAYER : org.bukkit.event.entity.EntityTargetEvent.TargetReason.CLOSEST_ENTITY, true); // Craftbukkit - reason
|
2014-11-26 05:32:16 +08:00
|
|
|
super.c();
|
|
|
|
}
|
2015-02-27 06:41:06 +08:00
|
|
|
|
2016-03-01 05:32:46 +08:00
|
|
|
@@ -103,7 +103,7 @@
|
2015-02-27 06:41:06 +08:00
|
|
|
return d0 < d1 ? -1 : (d0 > d1 ? 1 : 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
- public int compare(Object object, Object object1) {
|
|
|
|
+ public int compare(Entity object, Entity object1) { // CraftBukkit - fix decompile error
|
|
|
|
return this.a((Entity) object, (Entity) object1);
|
|
|
|
}
|
|
|
|
}
|