mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-20 12:19:48 +00:00
Merge branch 'master' into experimental
This commit is contained in:
commit
43b1c35668
2 files changed
+4
-3
No files matched your search
@@ -57,7 +57,7 @@ public class LavaTankLogic extends MultiServantLogic implements IFluidHandler
|
||||
@Override
|
||||
public boolean canFill (ForgeDirection from, Fluid fluid)
|
||||
{
|
||||
return tank.getFluidAmount() == 0 || tank.getFluidAmount() < tank.getCapacity();
|
||||
return tank.getFluidAmount() == 0 || (tank.getFluid().getFluid() == fluid && tank.getFluidAmount() < tank.getCapacity());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -8,6 +8,7 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.library.crafting.*;
|
||||
import tconstruct.library.modifier.IModifyable;
|
||||
import tconstruct.library.tools.ToolCore;
|
||||
import tconstruct.tools.inventory.ToolStationContainer;
|
||||
|
||||
/* Simple class for storing items in the block
|
||||
@@ -117,8 +118,8 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory
|
||||
else
|
||||
temp = inventory[1].copy();
|
||||
|
||||
if (temp == null)
|
||||
return null; // output as well as inventory is null :(
|
||||
if (temp == null || !(temp.getItem() instanceof ToolCore))
|
||||
return null; // output as well as inventory is null or not a tool :(
|
||||
|
||||
NBTTagCompound tags = temp.getTagCompound();
|
||||
if (tags == null)
|
||||
|
||||
Reference in new issue
Block a user