From 46e023a4191f6bbcf447a7913727f2cbad194673 Mon Sep 17 00:00:00 2001 From: mcmonkey4eva Date: Tue, 30 Jun 2015 19:16:15 -0700 Subject: [PATCH] Fix inventories when there are no NPCS mah bad --- src/main/java/net/aufdemrand/denizen/objects/dInventory.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/aufdemrand/denizen/objects/dInventory.java b/src/main/java/net/aufdemrand/denizen/objects/dInventory.java index 9e33b8b4cd..c3ab652181 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dInventory.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dInventory.java @@ -7,6 +7,7 @@ import net.aufdemrand.denizen.tags.BukkitTagContext; import net.aufdemrand.denizen.utilities.Utilities; import net.aufdemrand.denizen.utilities.debugging.dB; +import net.aufdemrand.denizen.utilities.depends.Depends; import net.aufdemrand.denizen.utilities.nbt.ImprovedOfflinePlayer; import net.aufdemrand.denizencore.objects.*; import net.aufdemrand.denizencore.objects.aH.Argument; @@ -1056,7 +1057,7 @@ public dInventory setSlots(int slot, ItemStack... items) { } inventory.setItem(slot + i, item); } - if (dNPC.matches(idHolder)) { // TODO: Directly store holder + if (Depends.citizens != null && dNPC.matches(idHolder)) { // TODO: Directly store holder dNPC.valueOf(idHolder).getInventoryTrait().setContents(inventory.getContents()); } return this;