From 50009786d832360eb5a2f68d156b57428f234008 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Fri, 7 Apr 2017 19:10:19 +0200 Subject: [PATCH] Fix #1546 Electric Engine via MFSU --- src/main/java/forestry/energy/tiles/TileEngineElectric.java | 2 +- .../java/forestry/lepidopterology/entities/EntityButterfly.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/forestry/energy/tiles/TileEngineElectric.java b/src/main/java/forestry/energy/tiles/TileEngineElectric.java index d857045a8..62f1236f5 100644 --- a/src/main/java/forestry/energy/tiles/TileEngineElectric.java +++ b/src/main/java/forestry/energy/tiles/TileEngineElectric.java @@ -61,7 +61,7 @@ // setInternalInventory(new InventoryEngineElectric(this)); // // if (PluginIC2.instance.isAvailable()) { -// ic2EnergySink = new BasicSink(this, euConfig.euStorage, 3); +// ic2EnergySink = new BasicSink(this, euConfig.euStorage, 4); // } // } // diff --git a/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java b/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java index f8a64c0ee..a7f4e074f 100755 --- a/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java +++ b/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java @@ -170,7 +170,7 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly if (nbttagcompound.hasKey("PLN")) { NBTTagCompound pollenNBT = nbttagcompound.getCompoundTag("PLN"); ISpeciesRoot root; - if(pollenNBT.hasKey("PLN")){ + if(pollenNBT.hasKey("Root")){ root = AlleleManager.alleleRegistry.getSpeciesRoot(pollenNBT.getString("Root")); }else{ root = TreeManager.treeRoot;