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

Fixed a crash with phantom redstonefaces >_>

Browse source
This commit is contained in:
Ellpeck 2016-07-05 08:26:11 +02:00
parent 980dc18085
commit 8b3de70a20
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java
View file

@ -18,6 +18,7 @@ import de.ellpeck.actuallyadditions.mod.util.Util;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
@ -197,11 +198,23 @@ public class TileEntityPhantomface extends TileEntityInventoryBase implements IP
@Override @Override
public boolean hasCapability(Capability<?> capability, EnumFacing facing){ public boolean hasCapability(Capability<?> capability, EnumFacing facing){
return this.isBoundThingInRange() ? this.worldObj.getTileEntity(this.boundPosition).hasCapability(capability, facing) : super.hasCapability(capability, facing); if(this.isBoundThingInRange()){
TileEntity tile = this.worldObj.getTileEntity(this.getBoundPosition());
if(tile != null){
return tile.hasCapability(capability, facing);
}
}
return super.hasCapability(capability, facing);
} }
@Override @Override
public <T> T getCapability(Capability<T> capability, EnumFacing facing){ public <T> T getCapability(Capability<T> capability, EnumFacing facing){
return this.isBoundThingInRange() ? this.worldObj.getTileEntity(this.boundPosition).getCapability(capability, facing) : super.getCapability(capability, facing); if(this.isBoundThingInRange()){
TileEntity tile = this.worldObj.getTileEntity(this.getBoundPosition());
if(tile != null){
return tile.getCapability(capability, facing);
}
}
return super.getCapability(capability, facing);
} }
} }