From 7ec23fe7dd253919e381a253412c6c8257059ed2 Mon Sep 17 00:00:00 2001
From: MorphanOne <morphanone@gmail.com>
Date: Mon, 19 Aug 2013 22:38:01 -0400
Subject: [PATCH] Fix dInventory NPE

---
 src/main/java/net/aufdemrand/denizen/Denizen.java            | 2 +-
 src/main/java/net/aufdemrand/denizen/objects/dInventory.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/aufdemrand/denizen/Denizen.java b/src/main/java/net/aufdemrand/denizen/Denizen.java
index 12baec9c2f..570cd9454a 100644
--- a/src/main/java/net/aufdemrand/denizen/Denizen.java
+++ b/src/main/java/net/aufdemrand/denizen/Denizen.java
@@ -138,7 +138,7 @@ public void onEnable() {
             return;
         } else startedSuccessful = true;
 
-        versionTag = getServer().getPluginManager().getPlugin("Denizen").getDescription().getVersion();
+        versionTag = this.getDescription().getVersion();
         
         // Startup procedure
         dB.echoDebug(DebugElement.Footer);
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dInventory.java b/src/main/java/net/aufdemrand/denizen/objects/dInventory.java
index 7e7dd29059..9325feb909 100644
--- a/src/main/java/net/aufdemrand/denizen/objects/dInventory.java
+++ b/src/main/java/net/aufdemrand/denizen/objects/dInventory.java
@@ -166,7 +166,7 @@ public dInventory(Inventory inventory) {
                 if (holder instanceof DoubleChest)
                     holderIdentifier = ((DoubleChest) holder).getLocation().toString();
                 else if (holder instanceof BlockState)
-                    holderIdentifier = getLocation().toString();
+                    holderIdentifier = ((BlockState) holder).getLocation().toString();
                 holderType = "location";
             }
             else if (holder instanceof Player) {
@@ -228,7 +228,7 @@ public dInventory(InventoryHolder holder) {
             if (holder instanceof DoubleChest)
                 holderIdentifier = ((DoubleChest) holder).getLocation().toString();
             else if (holder instanceof BlockState)
-                holderIdentifier = getLocation().toString();
+                holderIdentifier = ((BlockState) holder).getLocation().toString();
             holderType = "location";
         }
         else if (holder instanceof Player) {