From a70468ff72b5e3913601795bb89b06f696191a6b Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sat, 26 Nov 2016 19:02:59 +0100 Subject: [PATCH] fix a crash on startup with energy items --- .../actuallyadditions/mod/items/base/ItemEnergy.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java index 08df4dcaa..054c73f70 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java @@ -17,6 +17,7 @@ import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.data.PlayerData; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; import de.ellpeck.actuallyadditions.mod.util.compat.ItemTeslaWrapper; +import de.ellpeck.actuallyadditions.mod.util.compat.TeslaUtil; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -196,10 +197,12 @@ public abstract class ItemEnergy extends ItemEnergyContainer{ return (T)this.forgeUnitsWrapper; } else if(ActuallyAdditions.teslaLoaded){ - if(this.teslaWrapper == null){ - this.teslaWrapper = new ItemTeslaWrapper(this.stack, this.item); + if(capability == TeslaUtil.teslaConsumer || capability == TeslaUtil.teslaProducer || capability == TeslaUtil.teslaHolder){ + if(this.teslaWrapper == null){ + this.teslaWrapper = new ItemTeslaWrapper(this.stack, this.item); + } + return (T)this.teslaWrapper; } - return (T)this.teslaWrapper; } return null; }