Fix dInventory NPE

DenizenScript · Aug 20, 2013 · 7ec23fe · 7ec23fe
1 parent b8260a9
commit 7ec23fe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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) {