Don't re-register backpacks (=> crash)

copygirl · Jan 24, 2014 · 805c160 · 805c160
1 parent a65de71
commit 805c160
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/net/mcft/copy/betterstorage/item/ItemArmorBetterStorage.java b/src/net/mcft/copy/betterstorage/item/ItemArmorBetterStorage.java
@@ -18,10 +18,12 @@ public ItemArmorBetterStorage(int id, EnumArmorMaterial material, int renderSlot
 		setCreativeTab(BetterStorage.creativeTab);
 
 		setUnlocalizedName(Constants.modId + "." + getItemName());
-		GameRegistry.registerItem(this, getItemName());
+		if (!isItemBlock()) GameRegistry.registerItem(this, getItemName());
 
 	}
 
+	public boolean isItemBlock() { return false; }
+
 	/** Returns the name of this item, for example "drinkingHelmet". */
 	public String getItemName() {
 		return ((name != null) ? name : (name = MiscUtils.getName(this)));

diff --git a/src/net/mcft/copy/betterstorage/item/ItemBackpack.java b/src/net/mcft/copy/betterstorage/item/ItemBackpack.java
@@ -63,6 +63,9 @@ protected ItemBackpack(int id, EnumArmorMaterial material) {
 	}
 	public ItemBackpack(int id) { this(id, material); }
 
+	@Override
+	public boolean isItemBlock() { return true; }
+
 	public String getBackpackName() { return Constants.containerBackpack; }
 
 	/** Returns the number of columns this backpack has. */