From e33873581479a2df10ca58d87b3644fa0f98cc6f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 18 Jun 2016 18:36:15 -0500 Subject: [PATCH] Allow non-melle player damage to GG (arrows) damage cap still applies. Damage reduction in hard mode now done using armor --- .../common/entity/EntityDoppleganger.java | 19 ++++++++++--------- .../common/entity/EntityMagicLandmine.java | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 4615dfc2f..452296787 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -45,6 +45,7 @@ import net.minecraft.pathfinding.PathNavigateGround; import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntityBeacon; import net.minecraft.util.DamageSource; +import net.minecraft.util.EntityDamageSourceIndirect; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; @@ -215,6 +216,8 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { e.setPlayerCount(playerCount); e.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(MAX_HP * playerCount); + if (hard) + e.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.ARMOR).setBaseValue(15); e.playSound(SoundEvents.ENTITY_ENDERDRAGON_GROWL, 10F, 0.1F); world.spawnEntityInWorld(e); @@ -361,23 +364,21 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { } @Override - public boolean attackEntityFrom(@Nonnull DamageSource par1DamageSource, float par2) { - Entity e = par1DamageSource.getEntity(); - if((par1DamageSource.damageType.equals("player") || e instanceof EntityPixie) && e != null && isTruePlayer(e) && getInvulTime() == 0) { + public boolean attackEntityFrom(@Nonnull DamageSource source, float par2) { + Entity e = source.getEntity(); + + if (e instanceof EntityPlayer && isTruePlayer(e) && getInvulTime() == 0) { EntityPlayer player = (EntityPlayer) e; if(!playersWhoAttacked.contains(player.getUniqueID())) playersWhoAttacked.add(player.getUniqueID()); - boolean crit = false; - if(e instanceof EntityPlayer) { - EntityPlayer p = (EntityPlayer) e; - crit = p.fallDistance > 0.0F && !p.onGround && !p.isOnLadder() && !p.isInWater() && !p.isPotionActive(MobEffects.BLINDNESS) && !p.isRiding(); - } + boolean crit = player.fallDistance > 0.0F && !player.onGround && !player.isOnLadder() && !player.isInWater() && !player.isPotionActive(MobEffects.BLINDNESS) && !player.isRiding(); int cap = crit ? 60 : 40; - return super.attackEntityFrom(par1DamageSource, Math.min(cap, par2) * (isHardMode() ? 0.6F : 1F)); + return super.attackEntityFrom(source, Math.min(cap, par2)); } + return false; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java index d69335170..ae5936229 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java @@ -62,7 +62,7 @@ public class EntityMagicLandmine extends Entity { if(!worldObj.isRemote) { List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(posX - range, posY - range, posZ - range, posX + range, posY + range, posZ + range)); for(EntityPlayer player : players) { - player.attackEntityFrom(summoner == null ? DamageSource.generic : DamageSource.causeIndirectMagicDamage(this, summoner), 10); + player.attackEntityFrom(DamageSource.causeIndirectMagicDamage(this, summoner), 10); player.addPotionEffect(new PotionEffect(MobEffects.BLINDNESS, 25, 0)); PotionEffect wither = new PotionEffect(MobEffects.WITHER, 70, 3); wither.getCurativeItems().clear();