Fix #1179 Crash on world load

This commit is contained in:
Nedelosk committed 2016-05-15 21:08:48 +02:00
1 parent ea6fd2e3c0
commit bb3d736cb5
2 files changed
+2 -2

No files matched your search

@@ -32,7 +32,7 @@ public class GuiGreenhouse extends GuiForestryTitled<ContainerGreenhouse, TileGr
//Add the multiblock camouflage slots
widgetManager.add(new WidgetCamouflageSlot(widgetManager, 8, 16, inventory.getMultiblockLogic().getController(), EnumCamouflageType.DEFAULT));
widgetManager.add(new WidgetCamouflageSlot(widgetManager, 8, 37, inventory.getMultiblockLogic().getController(), EnumCamouflageType.GLASS));
widgetManager.add(new WidgetCamouflageSlot(widgetManager, 8, 58, inventory.getMultiblockLogic().getController(), EnumCamouflageType.DOOR));
//widgetManager.add(new WidgetCamouflageSlot(widgetManager, 8, 58, inventory.getMultiblockLogic().getController(), EnumCamouflageType.DOOR));
//Add the tile camouflage slots
widgetManager.add(new WidgetCamouflageSlot(widgetManager, 35, 37, inventory, tile.getCamouflageType()));
@@ -291,7 +291,7 @@ public class TileGreenhouseHatch extends MultiblockTileEntityBase<MultiblockLogi
}
}
if (((BlockGreenhouse) getBlockType()).getGreenhouseType() != BlockGreenhouseType.HATCH_OUTPUT) {
if (((BlockGreenhouse) getBlockType()).getGreenhouseType() != BlockGreenhouseType.HATCH_OUTPUT && outwards != null) {
outwards = outwards.getOpposite();
}
}