EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-28 19:54:44 +02:00
Code Issues Projects Releases Wiki Activity

Convert /ptp to use Bukkit CommandAPI

Browse Source
This commit is contained in:
GJ
2013-02-12 15:05:02 -05:00
parent 92473cc56d
commit adda85a660
4 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/com/gmail/nossr50/party/commands/PtpCommand.java
View File

@ -23,16 +23,10 @@ public class PtpCommand implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
String usage = LocaleLoader.getString("Commands.Usage.1", "ptp", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">");
if (CommandHelper.noConsoleUsage(sender)) {
return true;
}
if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.ptp")) {
return true;
}
switch (args.length) {
case 1:
player = (Player) sender;
@ -42,7 +36,8 @@ public class PtpCommand implements CommandExecutor {
if (args[0].equalsIgnoreCase("toggle")) {
return togglePartyTeleportation();
}
else if (args[0].equalsIgnoreCase("acceptany") || args[0].equalsIgnoreCase("acceptall")) {
if (args[0].equalsIgnoreCase("acceptany") || args[0].equalsIgnoreCase("acceptall")) {
return acceptAnyTeleportRequest();
}
@ -60,24 +55,30 @@ public class PtpCommand implements CommandExecutor {
return sendTeleportRequest(args[0]);
default:
sender.sendMessage(usage);
return true;
return false;
}
}
private boolean sendTeleportRequest(String args) {
Player target = mcMMO.p.getServer().getPlayer(args);
if (player.equals(target)) {
player.sendMessage(LocaleLoader.getString("Party.Teleport.Self"));
private boolean sendTeleportRequest(String playerName) {
if (!mcMMO.p.getServer().getOfflinePlayer(playerName).isOnline()) {
player.sendMessage(LocaleLoader.getString("Party.NotOnline", playerName));
return true;
}
if (target == null) {
McMMOPlayer mcMMOTarget = Users.getPlayer(playerName);
if (mcMMOTarget == null) {
player.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
return true;
}
Player target = mcMMOTarget.getPlayer();
if (player.equals(target)) {
player.sendMessage(LocaleLoader.getString("Party.Teleport.Self"));
return true;
}
if (target.isDead()) {
player.sendMessage(LocaleLoader.getString("Party.Teleport.Dead"));
return true;