From 201da35011195a8aa905f4f5433f33fd7f924ba5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Wed, 5 Aug 2015 21:14:42 +0200
Subject: [PATCH] Use a non-invalid default dummy item in loot generator.

---
 src/main/scala/li/cil/oc/common/Loot.scala | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/scala/li/cil/oc/common/Loot.scala b/src/main/scala/li/cil/oc/common/Loot.scala
index ca46dddb4..2cb79c1b3 100644
--- a/src/main/scala/li/cil/oc/common/Loot.scala
+++ b/src/main/scala/li/cil/oc/common/Loot.scala
@@ -14,7 +14,6 @@ import li.cil.oc.api.fs.FileSystem
 import li.cil.oc.common.init.Items
 import li.cil.oc.util.Color
 import net.minecraft.inventory.IInventory
-import net.minecraft.item.Item
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NBTTagCompound
 import net.minecraft.util.WeightedRandomChestContent
@@ -25,7 +24,15 @@ import net.minecraftforge.event.world.WorldEvent
 import scala.collection.convert.WrapAsScala._
 import scala.collection.mutable
 
-object Loot extends WeightedRandomChestContent(new ItemStack(null: Item), 1, 1, Settings.get.lootProbability) {
+class Loot extends WeightedRandomChestContent(api.Items.get(Constants.ItemName.Floppy).createItemStack(1), 1, 1, Settings.get.lootProbability) {
+  override def generateChestContent(random: Random, newInventory: IInventory) =
+    if (Loot.disksForSampling.nonEmpty)
+      ChestGenHooks.generateStacks(random, Loot.disksForSampling(random.nextInt(Loot.disksForSampling.length)),
+        theMinimumChanceToGenerateItem, theMaximumChanceToGenerateItem)
+    else Array.empty[ItemStack]
+}
+
+object Loot {
   val containers = Array(
     ChestGenHooks.DUNGEON_CHEST,
     ChestGenHooks.PYRAMID_DESERT_CHEST,
@@ -69,7 +76,7 @@ object Loot extends WeightedRandomChestContent(new ItemStack(null: Item), 1, 1,
 
   def init() {
     for (container <- containers) {
-      ChestGenHooks.addItem(container, Loot)
+      ChestGenHooks.addItem(container, new Loot())
     }
 
     val list = new java.util.Properties()
@@ -138,10 +145,4 @@ object Loot extends WeightedRandomChestContent(new ItemStack(null: Item), 1, 1,
     }
     stack
   }
-
-  override def generateChestContent(random: Random, newInventory: IInventory) =
-    if (disksForSampling.nonEmpty)
-      ChestGenHooks.generateStacks(random, disksForSampling(random.nextInt(disksForSampling.length)),
-        theMinimumChanceToGenerateItem, theMaximumChanceToGenerateItem)
-    else Array.empty[ItemStack]
 }