Merge branch 'v9' into 1.8.9

That was fun.
This commit is contained in:
Ben Spiers committed 2016-02-10 00:47:27 +00:00
commit fce32c8820
12 files changed
+218 -272

No files matched your search

@@ -160,7 +160,7 @@ public class TileEntityInductionCasing extends TileEntityMultiblock<Synchronized
return structure != null ? structure.getEnergy(worldObj) : 0;
}
else {
return structure.clientEnergy;
return structure != null ? structure.clientEnergy : 0;
}
}