diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java index 076fdb296..54bfb0a1f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java @@ -63,8 +63,8 @@ public class SubTileHeiseiDream extends SubTileFunctional { while(newTarget == entity); if(newTarget instanceof EntityLiving) { - List entries = new ArrayList(entity.tasks.taskEntries); - entries.addAll(new ArrayList(entity.targetTasks.taskEntries)); + List entries = new ArrayList<>(entity.tasks.taskEntries); + entries.addAll(new ArrayList<>(entity.targetTasks.taskEntries)); for(EntityAITaskEntry entry : entries) if(entry.action instanceof EntityAINearestAttackableTarget) { @@ -84,7 +84,8 @@ public class SubTileHeiseiDream extends SubTileFunctional { } private static void messWithGetTargetAI(EntityAINearestAttackableTarget aiEntry, EntityLivingBase target) { - ReflectionHelper.setPrivateValue(EntityAINearestAttackableTarget.class, aiEntry, IMob.class, LibObfuscation.TARGET_CLASS); + ReflectionHelper.setPrivateValue(EntityAINearestAttackableTarget.class, aiEntry, Entity.class, LibObfuscation.TARGET_CLASS); + ReflectionHelper.setPrivateValue(EntityAINearestAttackableTarget.class, aiEntry, Predicates.equalTo(target), LibObfuscation.TARGET_ENTITY_SELECTOR); // todo 1.8 will this leak `target`? ReflectionHelper.setPrivateValue(EntityAINearestAttackableTarget.class, aiEntry, target, LibObfuscation.TARGET_ENTITY); } diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index ba8f15405..8a4b74d7a 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -27,6 +27,7 @@ public final class LibObfuscation { // EntityAINearestAttackableTarget public static final String[] TARGET_CLASS = new String[] { "targetClass", "field_75307_b", "a" }; public static final String[] TARGET_ENTITY = new String[] { "targetEntity", "field_75309_a", "d" }; + public static final String[] TARGET_ENTITY_SELECTOR = new String[] { "targetEntitySelector", "field_82643_g", "c" }; // EntityAIAttackOnCollide public static final String[] CLASS_TARGET = new String[] { "classTarget", "field_75444_h", "g" };