diff --git a/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java b/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java index 542c69368..a35f87536 100644 --- a/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java @@ -67,7 +67,7 @@ public abstract class ExperienceCommand implements TabExecutor { } String playerName = Misc.getMatchedPlayerName(args[0]); - McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName); + McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true); // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process. if (mcMMOPlayer == null) { diff --git a/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java b/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java index 76f8e21a6..c1313ca32 100644 --- a/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java @@ -58,7 +58,7 @@ public class SkillresetCommand extends ExperienceCommand { } String playerName = Misc.getMatchedPlayerName(args[0]); - mcMMOPlayer = UserManager.getPlayer(playerName); + mcMMOPlayer = UserManager.getPlayer(playerName, true); // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process. if (mcMMOPlayer == null) { diff --git a/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java b/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java index 18db6cd8d..fef4b3335 100644 --- a/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java @@ -34,7 +34,7 @@ public class InspectCommand implements TabExecutor { } String playerName = Misc.getMatchedPlayerName(args[0]); - McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName); + McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true); // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process. if (mcMMOPlayer == null) { diff --git a/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java b/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java index 972382ea5..e28e84e63 100644 --- a/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java @@ -52,7 +52,7 @@ public class McrankCommand implements TabExecutor { } String playerName = Misc.getMatchedPlayerName(args[0]); - McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName); + McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true); if (mcMMOPlayer != null) { playerName = mcMMOPlayer.getPlayer().getName(); diff --git a/src/main/java/com/gmail/nossr50/util/player/UserManager.java b/src/main/java/com/gmail/nossr50/util/player/UserManager.java index 2fd5e8a60..532010d23 100644 --- a/src/main/java/com/gmail/nossr50/util/player/UserManager.java +++ b/src/main/java/com/gmail/nossr50/util/player/UserManager.java @@ -77,7 +77,7 @@ public final class UserManager { * @return the player's McMMOPlayer object */ public static McMMOPlayer getPlayer(String playerName) { - return retrieveMcMMOPlayer(playerName); + return retrieveMcMMOPlayer(playerName, false); } /** @@ -87,17 +87,24 @@ public final class UserManager { * @return the player's McMMOPlayer object */ public static McMMOPlayer getPlayer(OfflinePlayer player) { - return retrieveMcMMOPlayer(player.getName()); + return retrieveMcMMOPlayer(player.getName(), false); } - private static McMMOPlayer retrieveMcMMOPlayer(String playerName) { + public static McMMOPlayer getPlayer(String playerName, boolean offlineValid) { + return retrieveMcMMOPlayer(playerName, offlineValid); + } + + private static McMMOPlayer retrieveMcMMOPlayer(String playerName, boolean offlineValid) { McMMOPlayer mcMMOPlayer = players.get(playerName); if (mcMMOPlayer == null) { Player player = mcMMO.p.getServer().getPlayerExact(playerName); if (player == null) { - mcMMO.p.getLogger().warning("A valid mcMMOPlayer object could not be found for " + playerName + "."); + if (!offlineValid) { + mcMMO.p.getLogger().warning("A valid mcMMOPlayer object could not be found for " + playerName + "."); + } + return null; }