tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixes

Browse source
This commit is contained in:
aidancbrady 2016-03-27 20:30:04 -04:00
parent b64108d1c6
commit 1f0895322b
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java
View file

@ -16,7 +16,7 @@ public class ModelElectrolyticSeparator extends ModelBase
ModelRenderer tube4; ModelRenderer tube4;
ModelRenderer tube3; ModelRenderer tube3;
ModelRenderer tube2; ModelRenderer tube2;
ModelRenderer tube1; ModelRenderer tube1;
ModelRenderer base; ModelRenderer base;
ModelRenderer portToggle1; ModelRenderer portToggle1;
ModelRenderer portToggle2a; ModelRenderer portToggle2a;

2
src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java
View file

@ -108,7 +108,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen
} }
} }
if(MekanismUtils.canFunction(this) && getEnergy() >= energyPerTick && fluidTank.getFluid().getFluid().canBePlacedInWorld()) if(MekanismUtils.canFunction(this) && getEnergy() >= energyPerTick && fluidTank.getFluid() != null && fluidTank.getFluid().getFluid().canBePlacedInWorld())
{ {
if(!finishedCalc) if(!finishedCalc)
{ {

5
src/main/java/mekanism/common/util/MekanismUtils.java
View file

@ -515,6 +515,11 @@ public final class MekanismUtils
*/ */
public static int getBaseOrientation(int side, int blockFacing) public static int getBaseOrientation(int side, int blockFacing)
{ {
if(side == 0 || side == 1)
{
return side;
}
if(blockFacing == 3 || side == 1 || side == 0) if(blockFacing == 3 || side == 1 || side == 0)
{ {
if(side == 2 || side == 3) if(side == 2 || side == 3)