Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-26 16:58:34 +01:00
Code Issues Projects Releases Wiki Activity

Added an extra null check to WorldUtil's useItem

Browse source 
Hopefully closes #222
This commit is contained in:
Ellpeck 2016-09-01 19:53:53 +02:00
parent a4ac7ccb81
commit be3c7a81b1
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java
View file

@ -43,10 +43,7 @@ import net.minecraftforge.common.IPlantable;
import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.FakePlayer;
import net.minecraftforge.common.util.FakePlayerFactory; import net.minecraftforge.common.util.FakePlayerFactory;
import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.event.ForgeEventFactory;
import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.*;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidBlock;
import net.minecraftforge.fluids.IFluidContainerItem;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.CapabilityItemHandler;
@ -182,12 +179,18 @@ public final class WorldUtil{
fluid = ((IFluidContainerItem)stack.getItem()).getFluid(stack); fluid = ((IFluidContainerItem)stack.getItem()).getFluid(stack);
} }
if(fluid != null && fluid.amount >= Util.BUCKET && fluid.getFluid().getBlock() != null && fluid.getFluid().getBlock().canPlaceBlockAt(world, offsetPos)){ if(fluid != null && fluid.amount >= Util.BUCKET){
if(world.setBlockState(offsetPos, fluid.getFluid().getBlock().getDefaultState(), 2)){ Fluid theFluid = fluid.getFluid();
if(theFluid != null){
Block fluidBlock = theFluid.getBlock();
if(fluidBlock != null && fluidBlock.canPlaceBlockAt(world, offsetPos)){
if(world.setBlockState(offsetPos, fluidBlock.getDefaultState(), 2)){
return stack.getItem().getContainerItem(stack); return stack.getItem().getContainerItem(stack);
} }
} }
} }
}
}
//Redstone //Redstone
if(replaceable && stack.getItem() == Items.REDSTONE){ if(replaceable && stack.getItem() == Items.REDSTONE){