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

Arranged InspectCommand

Browse Source
This commit is contained in:
bm01 2012-07-07 19:39:22 +02:00
parent 73bb73c8ca
commit 5571e0bc0c
2 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java
View File

@ -1,13 +1,12 @@
package com.gmail.nossr50.commands.general; package com.gmail.nossr50.commands.general;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.commands.CommandHelper; import com.gmail.nossr50.commands.CommandHelper;
import com.gmail.nossr50.datatypes.McMMOPlayer;
import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.locale.LocaleLoader;
@ -16,15 +15,9 @@ import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Users; import com.gmail.nossr50.util.Users;
public class InspectCommand implements CommandExecutor { public class InspectCommand implements CommandExecutor {
private final mcMMO plugin;
public InspectCommand (mcMMO plugin) {
this.plugin = plugin;
}
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
OfflinePlayer target; Player target;
PlayerProfile profile; PlayerProfile profile;
String usage = "Proper usage is /inspect <player>"; //TODO: Needs more locale. String usage = "Proper usage is /inspect <player>"; //TODO: Needs more locale.
@ -34,23 +27,22 @@ public class InspectCommand implements CommandExecutor {
switch (args.length) { switch (args.length) {
case 1: case 1:
target = plugin.getServer().getOfflinePlayer(args[0]); McMMOPlayer mcmmoPlayer = Users.getPlayer(args[0]);
profile = Users.getProfile(target);
if (target.isOnline()) { if (mcmmoPlayer != null) {
Player player = (Player) target; target = mcmmoPlayer.getPlayer();
profile = Users.getProfile(player); profile = mcmmoPlayer.getProfile();
if (sender instanceof Player && !sender.isOp() && !Misc.isNear(((Player) sender).getLocation(), player.getLocation(), 5.0) && !Permissions.getInstance().inspectDistanceBypass((Player) sender)) { if (sender instanceof Player && !sender.isOp() && !Misc.isNear(((Player) sender).getLocation(), target.getLocation(), 5.0) && !Permissions.getInstance().inspectDistanceBypass((Player) sender)) {
sender.sendMessage(LocaleLoader.getString("Inspect.TooFar")); sender.sendMessage(LocaleLoader.getString("Inspect.TooFar"));
return true; return true;
} }
sender.sendMessage(LocaleLoader.getString("Inspect.Stats", new Object[] { target.getName() })); sender.sendMessage(LocaleLoader.getString("Inspect.Stats", new Object[] { target.getName() }));
CommandHelper.printGatheringSkills(player, sender); CommandHelper.printGatheringSkills(target, sender);
CommandHelper.printCombatSkills(player, sender); CommandHelper.printCombatSkills(target, sender);
CommandHelper.printMiscSkills(player, sender); CommandHelper.printMiscSkills(target, sender);
sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel", new Object[] { Users.getPlayer(player).getPowerLevel() })); sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel", new Object[] { mcmmoPlayer.getPowerLevel() }));
return true; return true;
} }
@ -60,7 +52,7 @@ public class InspectCommand implements CommandExecutor {
return true; return true;
} }
profile = new PlayerProfile(target.getName(), false); //Temporary Profile profile = new PlayerProfile(args[0], false); //Temporary Profile
if (!profile.isLoaded()) { if (!profile.isLoaded()) {
sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist")); sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));

2
src/main/java/com/gmail/nossr50/mcMMO.java
View File

@ -405,7 +405,7 @@ public class mcMMO extends JavaPlugin {
} }
if (configInstance.getCommandInspectEnabled()) { if (configInstance.getCommandInspectEnabled()) {
getCommand("inspect").setExecutor(new InspectCommand(this)); getCommand("inspect").setExecutor(new InspectCommand());
} }
if (configInstance.getCommandXPRateEnabled()) { if (configInstance.getCommandXPRateEnabled()) {