lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Hoard demons no longer 1HKO'd by dagger

Browse source
This commit is contained in:
WayofTime 2014-12-05 15:11:05 -05:00
parent 574f43010d
commit 22afbcbd11
18 changed files with 130 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/DemonPacketMinorGrunt.java
View file

@ -56,6 +56,6 @@ public class DemonPacketMinorGrunt extends DemonHoardPacket
entity.setAggro(true);
entity.setDropCrystal(false);
return 1;
return spawnGuardian ? 3 : 1;
}
}

1
src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntFire.java
View file

@ -13,6 +13,7 @@ public class EntityMinorDemonGruntFire extends EntityMinorDemonGrunt
{
super(par1World);
this.setDemonID(AlchemicalWizardry.entityMinorDemonGruntFireID);
this.isImmuneToFire = true;
}
@Override

20
src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/demonHoard/demon/EntityMinorDemonGruntWind.java
View file

@ -1,11 +1,13 @@
package WayofTime.alchemicalWizardry.common.demonVillage.demonHoard.demon;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.entity.projectile.WindGustProjectile;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.entity.projectile.WindGustProjectile;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
public class EntityMinorDemonGruntWind extends EntityMinorDemonGrunt
{
@ -24,8 +26,22 @@ public class EntityMinorDemonGruntWind extends EntityMinorDemonGrunt
return false;
}
if (par1Entity instanceof EntityPlayer)
{
SpellHelper.setPlayerSpeedFromServer((EntityPlayer) par1Entity, par1Entity.motionX, par1Entity.motionY + 3, par1Entity.motionZ);
} else if (par1Entity instanceof EntityLivingBase)
{
((EntityLivingBase) par1Entity).motionY += 3.0D;
}
return par1Entity.attackEntityFrom(DamageSource.causeMobDamage(this), (float) i);
}
@Override
public void onLivingUpdate()
{
this.fallDistance = 0;
}
@Override
public void attackEntityWithRangedAttack(EntityLivingBase par1EntityLivingBase, float par2)