From 1d4612857a2ef7441702f0b5ee070f4352c0e69b Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 15 Jul 2014 14:32:04 +0100 Subject: [PATCH] Pixie Fixes. --- MODSRC/vazkii/botania/common/entity/EntityPixie.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/MODSRC/vazkii/botania/common/entity/EntityPixie.java b/MODSRC/vazkii/botania/common/entity/EntityPixie.java index 51cca816f..ffd4ba57f 100644 --- a/MODSRC/vazkii/botania/common/entity/EntityPixie.java +++ b/MODSRC/vazkii/botania/common/entity/EntityPixie.java @@ -79,7 +79,6 @@ public class EntityPixie extends EntityFlyingCreature { target.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) summoner), damage); else { target.attackEntityFrom(DamageSource.causeMobDamage(summoner), damage); - System.out.println(target + " " + damage); } } else target.attackEntityFrom(DamageSource.causeMobDamage(this), damage); die(); @@ -89,6 +88,13 @@ public class EntityPixie extends EntityFlyingCreature { renderYawOffset = rotationYaw = -((float)Math.atan2(motionX, motionZ)) * 180.0F / (float)Math.PI; } + @Override + public boolean attackEntityFrom(DamageSource par1DamageSource, float par2) { + if(par1DamageSource.getEntity() != summoner) + return super.attackEntityFrom(par1DamageSource, par2); + return false; + } + @Override public void onEntityUpdate() { super.onEntityUpdate();