Merge branch 'master' into update

src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java

@@ -31,7 +31,6 @@
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Chunk;
-import org.bukkit.FluidCollisionMode;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -2091,19 +2090,6 @@ else if (cmd.getName().equalsIgnoreCase("gpreload"))
             return true;
         }
 
-        //gpblockinfo
-        else if (cmd.getName().equalsIgnoreCase("gpblockinfo") && player != null)
-        {
-            ItemStack inHand = player.getInventory().getItemInMainHand();
-            player.sendMessage("In Hand: " + inHand.getType().name());
-
-            Block inWorld = player.getTargetBlockExact(300, FluidCollisionMode.ALWAYS);
-            if (inWorld == null) inWorld = player.getEyeLocation().getBlock();
-            player.sendMessage("In World: " + inWorld.getType().name());
-
-            return true;
-        }
-
         //ignoreplayer
         else if (cmd.getName().equalsIgnoreCase("ignoreplayer") && player != null)
         {

src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java

@@ -1914,6 +1914,8 @@ else if (materialInHand == instance.config_claims_investigationTool && hand == E
                 return;
             }
 
+            playerData = this.dataStore.getPlayerData(player.getUniqueId());
+
             //if he's resizing a claim and that claim hasn't been deleted since he started resizing it
             if (playerData.claimResizing != null && playerData.claimResizing.inDataStore)
             {

src/main/resources/plugin.yml

@@ -153,10 +153,6 @@ commands:
     description: Reloads Grief Prevention's configuration settings.  Does NOT totally reload the entire plugin.
     usage: /<command>
     permission: griefprevention.reload
-  gpblockinfo:
-    description: Allows an administrator to get technical information about blocks in the world and items in hand.
-    usage: /<command>
-    permission: griefprevention.gpblockinfo
   #    ignoreplayer:
   #      description: Ignores another player's chat messages.
   #      usage: /IgnorePlayer <player name>
@@ -271,9 +267,6 @@ permissions:
   griefprevention.seeclaimsize:
     description: Allows a player to see claim size for other players claims when right clicking with investigation tool
     default: op
-  griefprevention.gpblockinfo:
-    description: Grants access to /gpblockinfo.
-    default: op
   griefprevention.overrideclaimcountlimit:
     description: Allows players to create more claims than the limit specified by the config.
     default: op