Merge pull request #476 from denoflionsx/master
Fixes RenderPipe crash if custom pipe has a higher capacity than 250.
This commit is contained in:
commit
3088a588f7
1 changed files with 3 additions and 3 deletions
|
@ -58,7 +58,7 @@ public class RenderPipe extends TileEntitySpecialRenderer {
|
||||||
private final static EntityItem dummyEntityItem = new EntityItem(null);
|
private final static EntityItem dummyEntityItem = new EntityItem(null);
|
||||||
|
|
||||||
private class DisplayLiquidList {
|
private class DisplayLiquidList {
|
||||||
|
|
||||||
public int[] sideHorizontal = new int[displayLiquidStages];
|
public int[] sideHorizontal = new int[displayLiquidStages];
|
||||||
public int[] sideVertical = new int[displayLiquidStages];
|
public int[] sideVertical = new int[displayLiquidStages];
|
||||||
public int[] centerHorizontal = new int[displayLiquidStages];
|
public int[] centerHorizontal = new int[displayLiquidStages];
|
||||||
|
@ -311,7 +311,7 @@ public class RenderPipe extends TileEntitySpecialRenderer {
|
||||||
if (d == null)
|
if (d == null)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
int stage = (int) ((float) liquid.amount / (float) (PipeTransportLiquids.LIQUID_IN_PIPE) * (displayLiquidStages - 1));
|
int stage = (int) ((float) liquid.amount / (float) (liq.getTanks(ForgeDirection.UNKNOWN)[0].getCapacity()) * (displayLiquidStages - 1));
|
||||||
|
|
||||||
GL11.glPushMatrix();
|
GL11.glPushMatrix();
|
||||||
int list = 0;
|
int list = 0;
|
||||||
|
@ -353,7 +353,7 @@ public class RenderPipe extends TileEntitySpecialRenderer {
|
||||||
DisplayLiquidList d = getListFromBuffer(liquid, pipe.worldObj);
|
DisplayLiquidList d = getListFromBuffer(liquid, pipe.worldObj);
|
||||||
|
|
||||||
if (d != null) {
|
if (d != null) {
|
||||||
int stage = (int) ((float) liquid.amount / (float) (PipeTransportLiquids.LIQUID_IN_PIPE) * (displayLiquidStages - 1));
|
int stage = (int) ((float) liquid.amount / (float) (liq.getTanks(ForgeDirection.UNKNOWN)[0].getCapacity()) * (displayLiquidStages - 1));
|
||||||
|
|
||||||
if (above)
|
if (above)
|
||||||
GL11.glCallList(d.centerVertical[stage]);
|
GL11.glCallList(d.centerVertical[stage]);
|
||||||
|
|
Loading…
Reference in a new issue