From 5393a5202a230a5f2391c0bbc465e6d8b4dc08df Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 20 Dec 2018 15:29:08 -0600 Subject: [PATCH] Fix sparks/corporea sparks blocking arrows and digging --- .../botania/common/entity/EntityCorporeaSpark.java | 6 +++--- .../vazkii/botania/common/entity/EntitySpark.java | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index 0de47fadd..da97279c4 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -55,12 +55,12 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { public EntityCorporeaSpark(World world) { super(world); + setSize(0.1F, 0.5F); isImmuneToFire = true; } @Override protected void entityInit() { - setSize(0.1F, 0.5F); dataManager.register(MASTER, false); dataManager.register(NETWORK, 0); dataManager.register(ITEM_DISPLAY_TICKS, 0); @@ -74,8 +74,8 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { } @Override - public boolean canBeCollidedWith() { - return true; + public boolean canBeAttackedWithItem() { + return false; } @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index e93d4e81c..d3862c089 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -61,12 +61,12 @@ public class EntitySpark extends Entity implements ISparkEntity { public EntitySpark(World world) { super(world); + setSize(0.1F, 0.5F); isImmuneToFire = true; } @Override protected void entityInit() { - setSize(0.1F, 0.5F); dataManager.register(UPGRADE, 0); } @@ -76,6 +76,11 @@ public class EntitySpark extends Entity implements ISparkEntity { return new ItemStack(ModItems.spark); } + @Override + public boolean canBeAttackedWithItem() { + return false; + } + @Override public void onUpdate() { super.onUpdate(); @@ -231,11 +236,6 @@ public class EntitySpark extends Entity implements ISparkEntity { setDead(); } - @Override - public boolean canBeCollidedWith() { - return true; - } - @Override public boolean processInitialInteract(EntityPlayer player, EnumHand hand) { ItemStack stack = player.getHeldItem(hand);