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

Fixed a transporter crash, don't scale Electrolytic Separator energy usage

Browse source
This commit is contained in:
aidancbrady 2015-05-10 19:20:36 -04:00
parent 9ffc1bdff3
commit 909e80ff77
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java
View file

@ -10,6 +10,7 @@ import java.util.Map;
import java.util.Set;
import mekanism.api.Coord4D;
import mekanism.api.transmitters.ITransmitterTile;
import mekanism.common.InventoryNetwork;
import mekanism.common.InventoryNetwork.AcceptorData;
import mekanism.common.base.ILogisticalTransporter;
@ -19,7 +20,7 @@ import mekanism.common.content.transporter.TransporterPathfinder.Pathfinder.Dest
import mekanism.common.content.transporter.TransporterStack.Path;
import mekanism.common.tile.TileEntityLogisticalSorter;
import mekanism.common.util.InventoryUtils;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
@ -71,7 +72,7 @@ public final class TransporterPathfinder
return new Destination(ret, true, null, 0).setPathType(Path.NONE);
}
else {
Destination newPath = TransporterPathfinder.getNewBasePath((ILogisticalTransporter)start.getTileEntity(worldObj), transportStack, 0);
Destination newPath = TransporterPathfinder.getNewBasePath((ILogisticalTransporter)((ITransmitterTile<IInventory, InventoryNetwork>)start.getTileEntity(worldObj)).getTransmitter(), transportStack, 0);
if(newPath != null && TransporterManager.didEmit(transportStack.itemStack, newPath.rejected))
{

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

@ -761,7 +761,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
{
case ENERGY:
maxEnergy = MekanismUtils.getMaxEnergy(this, BASE_MAX_ENERGY);
energyPerTick = MekanismUtils.getBaseEnergyPerTick(this, BASE_ENERGY_USAGE);
energyPerTick = BASE_ENERGY_USAGE; //Don't scale energy usage.
default:
break;
}