Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix corrupt board crash and tilebuffer crash

Browse source
This commit is contained in:
asiekierka 2015-04-28 20:15:58 +02:00
parent eea3c12c3e
commit 34ceaf4891
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/buildcraft/core/lib/TileBuffer.java
View file

@ -74,7 +74,7 @@ public final class TileBuffer {
return tile;
}
if ((forceUpdate && tile.isInvalid()) || tracker.markTimeIfDelay(world)) {
if ((forceUpdate && tile != null && tile.isInvalid()) || tracker.markTimeIfDelay(world)) {
refresh();
if (tile != null && !tile.isInvalid()) {

15
common/buildcraft/robotics/ItemRedstoneBoard.java
View file

@ -14,6 +14,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -39,7 +40,12 @@ public class ItemRedstoneBoard extends ItemBuildCraft {
NBTTagCompound cpt = NBTUtils.getItemData(stack);
if (cpt.hasKey("id") && !"<unknown>".equals(cpt.getString("id"))) {
RedstoneBoardRegistry.instance.getRedstoneBoard(cpt).addInformation(stack, player, list, advanced);
RedstoneBoardNBT board = RedstoneBoardRegistry.instance.getRedstoneBoard(cpt);
if (board != null) {
board.addInformation(stack, player, list, advanced);
} else {
list.add(EnumChatFormatting.BOLD + "Corrupt board!");
}
}
}
@ -52,7 +58,12 @@ public class ItemRedstoneBoard extends ItemBuildCraft {
} else if ("<unknown>".equals(cpt.getString("id"))) {
itemIcon = icons[1];
} else {
itemIcon = RedstoneBoardRegistry.instance.getRedstoneBoard(cpt).getIcon(cpt);
RedstoneBoardNBT board = RedstoneBoardRegistry.instance.getRedstoneBoard(cpt);
if (board != null) {
itemIcon = board.getIcon(cpt);
} else {
itemIcon = icons[1];
}
}
return itemIcon;