diff --git a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java index bcd30b11f..e87ce991a 100644 --- a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -33,7 +33,6 @@ public final class BotaniaCreativeTab extends CreativeTabs { super(LibMisc.MOD_ID); setNoTitle(); setBackgroundImageName(LibResources.GUI_CREATIVE); - } @Override diff --git a/MODSRC/vazkii/botania/common/entity/EntitySpark.java b/MODSRC/vazkii/botania/common/entity/EntitySpark.java index d9e2ec11d..49c259bc1 100644 --- a/MODSRC/vazkii/botania/common/entity/EntitySpark.java +++ b/MODSRC/vazkii/botania/common/entity/EntitySpark.java @@ -273,7 +273,7 @@ public class EntitySpark extends Entity implements ISparkEntity { Entity e = worldObj.getEntityByID(id); if(e != null && e instanceof ISparkEntity) { ISparkEntity spark = (ISparkEntity) e; - if(spark != this && !spark.areIncomingTransfersDone() && spark.getAttachedTile() != null && !spark.getAttachedTile().isFull() && ((getUpgrade() == 0 && spark.getUpgrade() == 2) || (getUpgrade() == 3 && (spark.getUpgrade() == 0 || spark.getUpgrade() == 1))) && spark.getAttachedTile() instanceof IManaPool) { + if(spark != this && !spark.areIncomingTransfersDone() && spark.getAttachedTile() != null && !spark.getAttachedTile().isFull() && (((getUpgrade() == 0 && spark.getUpgrade() == 2) || (getUpgrade() == 3 && (spark.getUpgrade() == 0 || spark.getUpgrade() == 1))) || !(spark.getAttachedTile() instanceof IManaPool))) { entities.add((ISparkEntity) e); added = true; }