dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix some blocks crashing on explosion

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-01-01 16:49:18 +01:00
parent 68a4dc7534
commit c245da1deb
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/storagecraft/tile/TileCable.java
View File

@@ -4,6 +4,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos; import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.world.World; import net.minecraft.world.World;
import storagecraft.StorageCraftBlocks;
import storagecraft.block.BlockCable; import storagecraft.block.BlockCable;
import java.util.List; import java.util.List;
@@ -34,7 +35,12 @@ public class TileCable extends TileBase
public boolean isSensitiveCable() public boolean isSensitiveCable()
{ {
return (Boolean) worldObj.getBlockState(pos).getValue(BlockCable.SENSITIVE); if (worldObj.getBlockState(pos).getBlock() == StorageCraftBlocks.CABLE)
{
return (Boolean) worldObj.getBlockState(pos).getValue(BlockCable.SENSITIVE);
}
return false;
} }
public boolean isEnabled() public boolean isEnabled()

17
src/main/java/storagecraft/tile/TileController.java
View File

@@ -8,6 +8,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos; import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import storagecraft.StorageCraft;
import storagecraft.StorageCraftBlocks; import storagecraft.StorageCraftBlocks;
import storagecraft.block.BlockController; import storagecraft.block.BlockController;
import storagecraft.block.EnumControllerType; import storagecraft.block.EnumControllerType;
@@ -115,7 +116,8 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
} }
} }
switch (getType()){ switch (getType())
{
case NORMAL: case NORMAL:
energy.extractEnergy(energyUsage, false); energy.extractEnergy(energyUsage, false);
break; break;
@@ -124,14 +126,21 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
break; break;
} }
if (lastEnergy != energy.getEnergyStored()) { if (lastEnergy != energy.getEnergyStored())
{
worldObj.updateComparatorOutputLevel(pos, StorageCraftBlocks.CONTROLLER); worldObj.updateComparatorOutputLevel(pos, StorageCraftBlocks.CONTROLLER);
} }
} }
} }
public EnumControllerType getType() { public EnumControllerType getType()
return (EnumControllerType) worldObj.getBlockState(pos).getValue(BlockController.TYPE); {
if (worldObj.getBlockState(pos).getBlock() == StorageCraftBlocks.CONTROLLER)
{
return (EnumControllerType) worldObj.getBlockState(pos).getValue(BlockController.TYPE);
}
return EnumControllerType.NORMAL;
} }
public void onDestroyed() public void onDestroyed()