PaperMC/nms-patches/PathfinderGoalNearestAttackableTarget.patch

57 lines
2.4 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java
+++ b/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java
2016-05-10 13:47:39 +02:00
@@ -35,7 +35,7 @@
2015-02-26 23:41:06 +01:00
}
2016-11-17 02:41:03 +01:00
public boolean apply(@Nullable Object object) {
2015-02-26 23:41:06 +01:00
- return this.a((EntityLiving) object);
+ return this.a((T) object); // CraftBukkit - fix decompile error
}
};
}
2016-05-10 13:47:39 +02:00
@@ -50,11 +50,11 @@
2016-02-29 22:32:46 +01:00
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 {
2016-06-09 03:43:49 +02:00
- this.d = this.e.world.a(this.e.locX, this.e.locY + (double) this.e.getHeadHeight(), this.e.locZ, this.i(), this.i(), new Function() {
+ this.d = (T) this.e.world.a(this.e.locX, this.e.locY + (double) this.e.getHeadHeight(), this.e.locZ, this.i(), this.i(), new Function<EntityHuman, Double>() { // CraftBukkit - fix decompile error
2016-05-10 13:47:39 +02:00
@Nullable
public Double a(@Nullable EntityHuman entityhuman) {
2016-02-29 22:32:46 +01:00
ItemStack itemstack = entityhuman.getEquipment(EnumItemSlot.HEAD);
2016-11-17 02:41:03 +01:00
@@ -74,10 +74,10 @@
2016-02-29 22:32:46 +01:00
}
2016-11-17 02:41:03 +01:00
@Nullable
- public Object apply(@Nullable Object object) {
+ public Double apply(@Nullable EntityHuman object) { // CraftBukkit - fix decompile error
2016-02-29 22:32:46 +01:00
return this.a((EntityHuman) object);
}
- }, this.c);
+ }, (Predicate<EntityHuman>) this.c); // CraftBukkit - fix decompile error
return this.d != null;
}
}
2016-11-17 02:41:03 +01:00
@@ -87,7 +87,7 @@
}
public void c() {
- this.e.setGoalTarget(this.d);
+ 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
super.c();
}
2015-02-26 23:41:06 +01:00
2016-11-17 02:41:03 +01:00
@@ -106,7 +106,7 @@
2015-02-26 23:41:06 +01: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);
}
}