mirror of
https://github.com/mcMMO-Dev/mcMMO.git
synced 2024-11-22 21:26:46 +01:00
parent
9730cdb880
commit
70160468c0
@ -17,6 +17,7 @@ Version 1.4.04-dev
|
|||||||
= Fixed bug where Shake wouldn't damage mobs whose max health was less than 4
|
= Fixed bug where Shake wouldn't damage mobs whose max health was less than 4
|
||||||
= Fixed bug where the API would fail if the name of a player's current party is requested when the player isn't in one (Thanks @dualspiral!)
|
= Fixed bug where the API would fail if the name of a player's current party is requested when the player isn't in one (Thanks @dualspiral!)
|
||||||
= Fixed bug with retrieving a player's party members
|
= Fixed bug with retrieving a player's party members
|
||||||
|
= Fixed bug which caused an NPE when trying to join a non-existing player
|
||||||
! Updated localization files
|
! Updated localization files
|
||||||
- Removed deprecated functions from API classes.
|
- Removed deprecated functions from API classes.
|
||||||
- Removed functions for getting the PlayerProfile - using API classes is preferred, but if not the McMMOPlayer should be used instead
|
- Removed functions for getting the PlayerProfile - using API classes is preferred, but if not the McMMOPlayer should be used instead
|
||||||
|
@ -31,6 +31,9 @@ public class PartyJoinCommand implements CommandExecutor {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mcMMOPlayer = UserManager.getPlayer(args[1]);
|
||||||
|
player = mcMMOPlayer.getPlayer();
|
||||||
|
|
||||||
String password = getPassword(args);
|
String password = getPassword(args);
|
||||||
|
|
||||||
// Make sure party passwords match
|
// Make sure party passwords match
|
||||||
@ -63,8 +66,8 @@ public class PartyJoinCommand implements CommandExecutor {
|
|||||||
private boolean canJoinParty(CommandSender sender, String targetName) {
|
private boolean canJoinParty(CommandSender sender, String targetName) {
|
||||||
mcMMOTarget = UserManager.getPlayer(targetName);
|
mcMMOTarget = UserManager.getPlayer(targetName);
|
||||||
|
|
||||||
if (CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
|
if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
|
||||||
return true;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
target = mcMMOTarget.getPlayer();
|
target = mcMMOTarget.getPlayer();
|
||||||
|
@ -67,17 +67,17 @@ public final class CommandUtils {
|
|||||||
|
|
||||||
public static boolean checkPlayerExistence(CommandSender sender, String playerName, McMMOPlayer mcMMOPlayer) {
|
public static boolean checkPlayerExistence(CommandSender sender, String playerName, McMMOPlayer mcMMOPlayer) {
|
||||||
if (mcMMOPlayer != null) {
|
if (mcMMOPlayer != null) {
|
||||||
return false;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
PlayerProfile playerProfile = new PlayerProfile(playerName, false);
|
PlayerProfile playerProfile = new PlayerProfile(playerName, false);
|
||||||
|
|
||||||
if (unloadedProfile(sender, playerProfile)) {
|
if (unloadedProfile(sender, playerProfile)) {
|
||||||
return true;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
|
sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
|
||||||
return true;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean unloadedProfile(CommandSender sender, PlayerProfile profile) {
|
public static boolean unloadedProfile(CommandSender sender, PlayerProfile profile) {
|
||||||
|
Loading…
Reference in New Issue
Block a user