EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-23 05:36:46 +01:00
Code Issues Projects Releases Wiki Activity

Fixed possible "array overflow" with /party kick

Browse Source
This commit is contained in:
bm01 2013-02-03 16:46:46 +01:00
parent e37e913f6a
commit 2de8962887
1 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/main/java/com/gmail/nossr50/party/commands/PartyCommand.java
View File

@ -67,7 +67,7 @@ public class PartyCommand implements CommandExecutor {
return invite(args); return invite(args);
} }
else if (args[0].equalsIgnoreCase("kick")) { else if (args[0].equalsIgnoreCase("kick")) {
return kick(args[1]); return kick(args);
} }
else if (args[0].equalsIgnoreCase("disband")) { else if (args[0].equalsIgnoreCase("disband")) {
return disband(); return disband();
@ -449,42 +449,49 @@ public class PartyCommand implements CommandExecutor {
/** /**
* Kick a party member * Kick a party member
*/ */
private boolean kick(String targetName) { private boolean kick(String[] args) {
if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.party.kick")) { if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.party.kick")) {
return true; return true;
} }
String playerName = player.getName(); switch (args.length) {
Party party = mcMMOPlayer.getParty(); case 2:
String playerName = player.getName();
Party party = mcMMOPlayer.getParty();
if (party.getLeader().equals(playerName)) { if (party.getLeader().equals(playerName)) {
if (!party.getMembers().contains(targetName)) { if (!party.getMembers().contains(args[1])) {
player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", targetName)); player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", args[1]));
return true;
}
Player target = mcMMO.p.getServer().getOfflinePlayer(targetName).getPlayer();
if (target != null) {
String partyName = party.getName();
McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(target, partyName, null, EventReason.KICKED_FROM_PARTY);
mcMMO.p.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
return true; return true;
} }
target.sendMessage(LocaleLoader.getString("Commands.Party.Kick", partyName)); Player target = mcMMO.p.getServer().getOfflinePlayer(args[1]).getPlayer();
if (target != null) {
String partyName = party.getName();
McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(target, partyName, null, EventReason.KICKED_FROM_PARTY);
mcMMO.p.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
return true;
}
target.sendMessage(LocaleLoader.getString("Commands.Party.Kick", partyName));
}
PartyManager.removeFromParty(args[1], party);
}
else {
player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
} }
PartyManager.removeFromParty(targetName, party); return true;
}
else {
player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
}
return true; default:
player.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "invite", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"));
return true;
}
} }
/** /**
@ -531,7 +538,7 @@ public class PartyCommand implements CommandExecutor {
Party party = mcMMOPlayer.getParty(); Party party = mcMMOPlayer.getParty();
if (args.length < 2) { if (args.length < 2) {
player.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "owner", "[" + LocaleLoader.getString("Commands.Usage.Player") + "]")); player.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "kick", "[" + LocaleLoader.getString("Commands.Usage.Player") + "]"));
return true; return true;
} }