diff --git a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java index aed382087..c9e0f247f 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java +++ b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java @@ -14,6 +14,7 @@ package vazkii.botania.common.block.subtile.functional; import java.util.ArrayList; import java.util.List; +import net.minecraft.entity.EntityCreature; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAIAttackOnCollide; @@ -41,36 +42,43 @@ public class SubTileHeiseiDream extends SubTileFunctional { for(IMob mob : mobs) { if(mob instanceof EntityLiving) { EntityLiving entity = (EntityLiving) mob; - brainwashEntity(entity, mobs); - - mana -= cost; - sync(); - break; - + if(brainwashEntity(entity, mobs)) { + mana -= cost; + sync(); + break; + } } } } - public static void brainwashEntity(EntityLiving entity, List mobs) { + public static boolean brainwashEntity(EntityLiving entity, List mobs) { EntityLivingBase target = entity.getAttackTarget(); + boolean did = false; + if(target == null || !(target instanceof IMob)) { IMob newTarget; do newTarget = mobs.get(entity.worldObj.rand.nextInt(mobs.size())); while(newTarget == entity); if(newTarget instanceof EntityLiving) { - entity.setAttackTarget((EntityLiving) newTarget); - List entries = new ArrayList(entity.tasks.taskEntries); entries.addAll(new ArrayList(entity.targetTasks.taskEntries)); for(EntityAITaskEntry entry : entries) - if(entry.action instanceof EntityAINearestAttackableTarget) + if(entry.action instanceof EntityAINearestAttackableTarget) { messWithGetTargetAI((EntityAINearestAttackableTarget) entry.action, (EntityLiving) newTarget); - else if(entry.action instanceof EntityAIAttackOnCollide) + did = true; + } else if(entry.action instanceof EntityAIAttackOnCollide) { messWithAttackOnCollideAI((EntityAIAttackOnCollide) entry.action); + did = true; + } + + if(did) + entity.setAttackTarget((EntityLiving) newTarget); } } + + return did; } private static void messWithGetTargetAI(EntityAINearestAttackableTarget aiEntry, EntityLivingBase target) { diff --git a/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java b/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java index a809d761b..cec66349f 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java +++ b/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java @@ -14,6 +14,7 @@ package vazkii.botania.common.item.equipment.bauble; import java.util.List; import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -25,9 +26,11 @@ import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.block.subtile.functional.SubTileHeiseiDream; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibObfuscation; import baubles.api.BaubleType; import baubles.common.lib.PlayerHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.ReflectionHelper; public class ItemDivaCharm extends ItemBauble implements IManaUsingItem { @@ -38,7 +41,7 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem { @SubscribeEvent public void onEntityDamaged(LivingHurtEvent event) { - if(event.source.getEntity() instanceof EntityPlayer && event.entityLiving instanceof EntityLiving && Math.random() < 0.3333F) { + if(event.source.getEntity() instanceof EntityPlayer && event.entityLiving instanceof EntityLiving && !event.entityLiving.worldObj.isRemote && Math.random() < 0.6F) { EntityPlayer player = (EntityPlayer) event.source.getEntity(); ItemStack amulet = PlayerHandler.getPlayerBaubles(player).getStackInSlot(0); if(amulet != null && amulet.getItem() == this) { @@ -48,17 +51,23 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem { List mobs = player.worldObj.getEntitiesWithinAABB(IMob.class, AxisAlignedBB.getBoundingBox(event.entity.posX - range, event.entity.posY - range, event.entity.posZ - range, event.entity.posX + range, event.entity.posY + range, event.entity.posZ + range)); if(mobs.size() > 1) { - SubTileHeiseiDream.brainwashEntity((EntityLiving) event.entityLiving, mobs); - event.entityLiving.heal(event.entityLiving.getMaxHealth()); - ManaItemHandler.requestManaExact(amulet, player, cost, true); - player.worldObj.playSoundAtEntity(player, "random.levelup", 1F, 1F); + if(SubTileHeiseiDream.brainwashEntity((EntityLiving) event.entityLiving, mobs)) { + if(event.entityLiving instanceof EntityCreeper) + ReflectionHelper.setPrivateValue(EntityCreeper.class, (EntityCreeper) event.entityLiving, 2, LibObfuscation.TIME_SINCE_IGNITED); + event.entityLiving.heal(event.entityLiving.getMaxHealth()); + if(event.entityLiving.isDead) + event.entityLiving.isDead = false; + + ManaItemHandler.requestManaExact(amulet, player, cost, true); + player.worldObj.playSoundAtEntity(player, "random.levelup", 1F, 1F); - double x = event.entityLiving.posX; - double y = event.entityLiving.posY; - double z = event.entityLiving.posZ; + double x = event.entityLiving.posX; + double y = event.entityLiving.posY; + double z = event.entityLiving.posZ; - for(int i = 0; i < 50; i++) - Botania.proxy.sparkleFX(event.entityLiving.worldObj, x + Math.random() * event.entityLiving.width, y + Math.random() * event.entityLiving.height, z + Math.random() * event.entityLiving.width, 1F, 1F, 0.25F, 1F, 3); + for(int i = 0; i < 50; i++) + Botania.proxy.sparkleFX(event.entityLiving.worldObj, x + Math.random() * event.entityLiving.width, y + Math.random() * event.entityLiving.height, z + Math.random() * event.entityLiving.width, 1F, 1F, 0.25F, 1F, 3); + } } } }