From 906bc01b915c3887baccf54f79b1c388e9149299 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Wed, 29 Feb 2012 13:02:24 -0800
Subject: [PATCH] Inspect now checks if player exists in Database

---
 src/main/java/com/gmail/nossr50/Users.java    |  2 +-
 .../commands/general/InspectCommand.java      |  9 ++++
 .../nossr50/datatypes/PlayerProfile.java      | 43 ++++++++++++++++++-
 3 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/Users.java b/src/main/java/com/gmail/nossr50/Users.java
index 0bf39b0f0..19af9caca 100644
--- a/src/main/java/com/gmail/nossr50/Users.java
+++ b/src/main/java/com/gmail/nossr50/Users.java
@@ -117,7 +117,7 @@ public class Users {
     }
     
     public static PlayerProfile getOfflineProfile(String playerName){
-        return new PlayerProfile(playerName);
+        return new PlayerProfile(playerName, false);
     }
     
     public static Users getInstance() {
diff --git a/src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java b/src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java
index 2f1e7e6d5..c11a276aa 100644
--- a/src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java
@@ -93,6 +93,15 @@ public class InspectCommand implements CommandExecutor {
             }
             
             PlayerProfile PPt = Users.getOfflineProfile(args[0]);
+            
+            if(!PPt.isLoaded())
+            {
+                sender.sendMessage("Player does not exist in the database!");
+                return true;
+            }
+            
+            System.out.println(PPt.isLoaded());
+            
             sender.sendMessage(ChatColor.GREEN + "mcMMO Stats for Offline Player " + ChatColor.YELLOW + args[0]);
 
             sender.sendMessage(ChatColor.GOLD + "-=GATHERING SKILLS=-");
diff --git a/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java b/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java
index 521670ebc..05444738e 100644
--- a/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java
@@ -46,7 +46,7 @@ public class PlayerProfile
 	private String party, invite;
 	
 	//TOGGLES
-	private boolean partyhud = true, spoutcraft = false, filling = false, xpbarlocked = false, placedAnvil = false, partyChatMode = false, adminChatMode = false, godMode = false, greenTerraMode, partyChatOnly = false, greenTerraInformed = true, berserkInformed = true, skullSplitterInformed = true, gigaDrillBreakerInformed = true, 
+	private boolean loaded = false, partyhud = true, spoutcraft = false, filling = false, xpbarlocked = false, placedAnvil = false, partyChatMode = false, adminChatMode = false, godMode = false, greenTerraMode, partyChatOnly = false, greenTerraInformed = true, berserkInformed = true, skullSplitterInformed = true, gigaDrillBreakerInformed = true, 
 	superBreakerInformed = true, serratedStrikesInformed = true, treeFellerInformed = true, dead, abilityuse = true, treeFellerMode, superBreakerMode, gigaDrillBreakerMode, 
 	serratedStrikesMode, hoePreparationMode = false, shovelPreparationMode = false, swordsPreparationMode = false, fistsPreparationMode = false, pickaxePreparationMode = false, axePreparationMode = false, skullSplitterMode, berserkMode;
 	
@@ -96,10 +96,43 @@ public class PlayerProfile
 				loadMySQL();//This is probably not needed anymore, could just delete
 			}
 		} else {
-			if(!load()) { addPlayer(); }			
+			if(!load()) { addPlayer();}
 		}
 		lastlogin = ((Long) (System.currentTimeMillis()/1000)).intValue();
 	}
+	
+	public PlayerProfile(String name, boolean addNew)
+    {
+        hud = LoadProperties.defaulthud;
+        //Setup the HashMap for ability DATS
+        for(AbilityType abilityType : AbilityType.values())
+        {
+            skillsDATS.put(abilityType, 0);
+        }
+        
+        //Setup the HashMap for the skills
+        for(SkillType skillType : SkillType.values())
+        {
+            if(skillType != SkillType.ALL)
+            {
+                skills.put(skillType, 0);
+                skillsXp.put(skillType, 0);
+            }
+        }
+        
+        playerName = name;
+        if (LoadProperties.useMySQL) 
+        {
+            if(!loadMySQL() && addNew) {
+                addMySQLPlayer();
+                loadMySQL();//This is probably not needed anymore, could just delete
+            }
+        } else {
+            if(!load() && addNew) { addPlayer(); loaded = true; }
+        }
+        lastlogin = ((Long) (System.currentTimeMillis()/1000)).intValue();
+    }
+	
 	public int getLastLogin()
 	{
 		return lastlogin;
@@ -183,6 +216,7 @@ public class PlayerProfile
 				skillsXp.put(SkillType.AXES, Integer.valueOf(experience.get(1).get(9)));
 				skillsXp.put(SkillType.ACROBATICS, Integer.valueOf(experience.get(1).get(10)));
 				skillsXp.put(SkillType.FISHING, Integer.valueOf(experience.get(1).get(11)));
+			loaded = true;
 			return true;
 		}
 		else {
@@ -291,6 +325,7 @@ public class PlayerProfile
     			if(character.length > 35)
     				skillsXp.put(SkillType.FISHING, Integer.valueOf(character[35]));
             	in.close();
+            	loaded = true;
     			return true;
         	}
         	in.close();
@@ -500,6 +535,10 @@ public class PlayerProfile
     {
     	partyhud = !partyhud;
     }
+    public boolean isLoaded()
+    {
+        return loaded;
+    }
     public boolean getPartyHUD()
     {
     	return partyhud;