EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-25 18:24:43 +02:00
Code Issues Projects Releases Wiki Activity

Fix a NPE when trying to join a non-existing player

Browse Source 
Fixes #860
This commit is contained in:
TfT_02
2013-03-21 22:04:52 +01:00
parent 9730cdb880
commit 70160468c0
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java
View File

@ -31,6 +31,9 @@ public class PartyJoinCommand implements CommandExecutor {
return true;
}
mcMMOPlayer = UserManager.getPlayer(args[1]);
player = mcMMOPlayer.getPlayer();
String password = getPassword(args);
// Make sure party passwords match
@ -63,8 +66,8 @@ public class PartyJoinCommand implements CommandExecutor {
private boolean canJoinParty(CommandSender sender, String targetName) {
mcMMOTarget = UserManager.getPlayer(targetName);
if (CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
return true;
if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
return false;
}
target = mcMMOTarget.getPlayer();

6
src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java
View File

@ -67,17 +67,17 @@ public final class CommandUtils {
public static boolean checkPlayerExistence(CommandSender sender, String playerName, McMMOPlayer mcMMOPlayer) {
if (mcMMOPlayer != null) {
return false;
return true;
}
PlayerProfile playerProfile = new PlayerProfile(playerName, false);
if (unloadedProfile(sender, playerProfile)) {
return true;
return false;
}
sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
return true;
return false;
}
public static boolean unloadedProfile(CommandSender sender, PlayerProfile profile) {