From adfc6e41d9c63ae377d89627223ef7a01004ae40 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 13 Jul 2017 20:21:11 -0500 Subject: [PATCH] Check spark liveness before interacting. Closes #2302 --- .../java/vazkii/botania/common/entity/EntityCorporeaSpark.java | 2 +- src/main/java/vazkii/botania/common/entity/EntitySpark.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index 2ef10ae3c..6be72680b 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -262,7 +262,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { @Override public boolean processInitialInteract(EntityPlayer player, EnumHand hand) { ItemStack stack = player.getHeldItem(hand); - if(!stack.isEmpty()) { + if(!isDead && !stack.isEmpty()) { if(player.world.isRemote) { boolean valid = stack.getItem() == ModItems.twigWand || stack.getItem() == ModItems.dye || stack.getItem() == ModItems.phantomInk; if(valid) diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index 8a0aab892..9a54c95a1 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -242,7 +242,7 @@ public class EntitySpark extends Entity implements ISparkEntity { @Override public boolean processInitialInteract(EntityPlayer player, EnumHand hand) { ItemStack stack = player.getHeldItem(hand); - if(!stack.isEmpty()) { + if(!isDead && !stack.isEmpty()) { if(world.isRemote) { boolean valid = stack.getItem() == ModItems.twigWand || stack.getItem() == ModItems.sparkUpgrade || stack.getItem() == ModItems.phantomInk;