preparations for BuildCraft 7.0.23

This commit is contained in:
Adrian 2015-09-11 21:01:10 +02:00
parent 91b8b8df83
commit 37bda2f153
2 changed files with 5 additions and 2 deletions

View file

@ -45,6 +45,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.client.event.RenderWorldLastEvent;
import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.common.IPlantable;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.event.world.WorldEvent;
import net.minecraftforge.fluids.BlockFluidBase; import net.minecraftforge.fluids.BlockFluidBase;
@ -463,7 +464,7 @@ public class BuildCraftCore extends BuildCraftMod {
for (Object o : Block.blockRegistry) { for (Object o : Block.blockRegistry) {
Block block = (Block) o; Block block = (Block) o;
if (block instanceof BlockFluidBase || block instanceof BlockLiquid) { if (block instanceof BlockFluidBase || block instanceof BlockLiquid || block instanceof IPlantable) {
BuildCraftAPI.softBlocks.add(block); BuildCraftAPI.softBlocks.add(block);
} }
} }

View file

@ -695,7 +695,9 @@ public class EntityRobot extends EntityRobotBase implements
@Override @Override
public ItemStack getStackInSlotOnClosing(int var1) { public ItemStack getStackInSlotOnClosing(int var1) {
return inv[var1].splitStack(var1); ItemStack stack = inv[var1];
inv[var1] = null;
return stack;
} }
@Override @Override