From 3ccac3207efcdabe8149072766a7e4a22527c93a Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sat, 25 Apr 2015 15:56:05 +0100 Subject: [PATCH] Pixies no longer apply potion effects to players. Easiest fix for a crash when a player takes damage from a ComputerCraft turtle. Closes #820 --- src/main/java/vazkii/botania/common/entity/EntityPixie.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityPixie.java b/src/main/java/vazkii/botania/common/entity/EntityPixie.java index 3731fe346..ad9462379 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPixie.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPixie.java @@ -85,7 +85,7 @@ public class EntityPixie extends EntityFlyingCreature { target.attackEntityFrom(DamageSource.causeMobDamage(summoner), damage); } } else target.attackEntityFrom(DamageSource.causeMobDamage(this), damage); - if(effect != null) + if(effect != null && !(target instanceof EntityPlayer)) target.addPotionEffect(effect); die(); }