Pushing changes in 1.7.2 to 1.6.4 build

This commit is contained in:
WayofTime 2014-03-15 17:43:59 -04:00
parent a4a02b4118
commit fa9112493c
170 changed files with 4803 additions and 272 deletions

View file

@ -1,6 +1,7 @@
package WayofTime.alchemicalWizardry.common.rituals;
import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import net.minecraft.entity.player.EntityPlayer;
@ -84,7 +85,7 @@ public class RitualEffectFeatheredKnife extends RitualEffect
{
entity = (EntityPlayer) iterator1.next();
if (entity.getClass().equals(EntityPlayerMP.class) || entity.getClass().equals(EntityPlayer.class))
if (!SpellHelper.isFakePlayer(world, entity))
{
entityCount++;
}
@ -110,7 +111,7 @@ public class RitualEffectFeatheredKnife extends RitualEffect
entity = (EntityPlayer) iterator2.next();
//entity = (EntityPlayer)iterator1.next();
if (entity.getClass().equals(EntityPlayerMP.class) || entity.getClass().equals(EntityPlayer.class))
if (!SpellHelper.isFakePlayer(world, entity))
{
if (entity.getHealth() > 6.2f)
{