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

Merge branch 'master' of https://github.com/WayofTime/BloodMagic

Browse source 
Conflicts:
	src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBoulderFist.java
This commit is contained in:
Arcaratus 2015-07-18 10:08:42 -04:00
commit 098d86596b
2 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBoulderFist.java
View file

@ -106,7 +106,6 @@ public class EntityBoulderFist extends EntityDemon
{ {
super.entityInit(); super.entityInit();
this.dataWatcher.addObject(18, this.getHealth()); this.dataWatcher.addObject(18, this.getHealth());
this.dataWatcher.addObject(19, 0);
} }
/** /**

27
src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityIceDemon.java
View file

@ -1,12 +1,20 @@
package WayofTime.alchemicalWizardry.common.entity.mob; package WayofTime.alchemicalWizardry.common.entity.mob;
import WayofTime.alchemicalWizardry.AlchemicalWizardry; import net.minecraft.entity.Entity;
import WayofTime.alchemicalWizardry.ModItems; import net.minecraft.entity.EntityAgeable;
import WayofTime.alchemicalWizardry.common.EntityAITargetAggro; import net.minecraft.entity.EntityLivingBase;
import WayofTime.alchemicalWizardry.common.entity.projectile.IceProjectile; import net.minecraft.entity.IRangedAttackMob;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.*; import net.minecraft.entity.ai.EntityAIArrowAttack;
import net.minecraft.entity.ai.*; import net.minecraft.entity.ai.EntityAIAttackOnCollide;
import net.minecraft.entity.ai.EntityAIFollowOwner;
import net.minecraft.entity.ai.EntityAIHurtByTarget;
import net.minecraft.entity.ai.EntityAILookIdle;
import net.minecraft.entity.ai.EntityAIOwnerHurtByTarget;
import net.minecraft.entity.ai.EntityAIOwnerHurtTarget;
import net.minecraft.entity.ai.EntityAISwimming;
import net.minecraft.entity.ai.EntityAIWander;
import net.minecraft.entity.ai.EntityAIWatchClosest;
import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.EntityCreeper;
import net.minecraft.entity.monster.EntityGhast; import net.minecraft.entity.monster.EntityGhast;
import net.minecraft.entity.passive.EntityHorse; import net.minecraft.entity.passive.EntityHorse;
@ -18,6 +26,11 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.DamageSource; import net.minecraft.util.DamageSource;
import net.minecraft.util.Vec3; import net.minecraft.util.Vec3;
import net.minecraft.world.World; import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.ModItems;
import WayofTime.alchemicalWizardry.common.EntityAITargetAggro;
import WayofTime.alchemicalWizardry.common.entity.projectile.IceProjectile;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
public class EntityIceDemon extends EntityDemon implements IRangedAttackMob public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
{ {