Anvilcraft/buildcraft
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #3130 from iTitus/fix-3128

Browse source 
Fix #3128
This commit is contained in:
Adrian Siekierka 2015-11-15 21:04:33 +01:00
parent 207f85958b 036d84133b
commit e2af94bcb4
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
common/buildcraft/factory/render/RenderTank.java
View file

@ -30,11 +30,18 @@ public class RenderTank extends TileEntitySpecialRenderer {
TileTank tank = (TileTank) CoreProxy.proxy.getServerTile(tileentity);
FluidStack liquid = tank.tank.getFluid();
int color = tank.tank.colorRenderCache;
if (liquid == null || liquid.amount <= 0) {
if (liquid == null || liquid.getFluid() == null || liquid.amount <= 0) {
return;
}
// Workaround: The colorRenderCache from the server tile from getServerTile(...) does not get synced properly
int color;
if(tank.getWorldObj().isRemote) {
color = tank.tank.colorRenderCache;
} else {
color = liquid.getFluid().getColor(liquid);
}
int[] displayList = FluidRenderer.getFluidDisplayLists(liquid, tileentity.getWorldObj(), false);
if (displayList == null) {
return;