Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-28 03:27:39 +01:00
Code Issues Projects Releases Wiki Activity

Don't use a class variable here.

Browse Source
This commit is contained in:
GJ 2013-10-28 14:14:20 -04:00
parent 4715688fe8
commit 8369ae4616
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java
View File

@ -23,26 +23,28 @@ import com.gmail.nossr50.util.player.UserManager;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
public class MctopCommand implements TabExecutor { public class MctopCommand implements TabExecutor {
private SkillType skill;
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
SkillType skill = null;
switch (args.length) { switch (args.length) {
case 0: case 0:
display(1, sender, command); display(1, skill, sender, command);
return true; return true;
case 1: case 1:
if (StringUtils.isInt(args[0])) { if (StringUtils.isInt(args[0])) {
display(Math.abs(Integer.parseInt(args[0])), sender, command); display(Math.abs(Integer.parseInt(args[0])), skill, sender, command);
return true; return true;
} }
if (!extractSkill(sender, args[0])) { skill = extractSkill(sender, args[0]);
if (skill == null) {
return true; return true;
} }
display(1, sender, command); display(1, skill, sender, command);
return true; return true;
case 2: case 2:
@ -50,11 +52,13 @@ public class MctopCommand implements TabExecutor {
return true; return true;
} }
if (!extractSkill(sender, args[0])) { skill = extractSkill(sender, args[0]);
if (skill == null) {
return true; return true;
} }
display(Math.abs(Integer.parseInt(args[1])), sender, command); display(Math.abs(Integer.parseInt(args[1])), skill, sender, command);
return true; return true;
default: default:
@ -72,7 +76,7 @@ public class MctopCommand implements TabExecutor {
} }
} }
private void display(int page, CommandSender sender, Command command) { private void display(int page, SkillType skill, CommandSender sender, Command command) {
if (skill != null && !Permissions.mctop(sender, skill)) { if (skill != null && !Permissions.mctop(sender, skill)) {
sender.sendMessage(command.getPermissionMessage()); sender.sendMessage(command.getPermissionMessage());
return; return;
@ -99,17 +103,17 @@ public class MctopCommand implements TabExecutor {
new MctopCommandAsyncTask(page, skill, sender, useBoard, useChat).runTaskAsynchronously(mcMMO.p); new MctopCommandAsyncTask(page, skill, sender, useBoard, useChat).runTaskAsynchronously(mcMMO.p);
} }
private boolean extractSkill(CommandSender sender, String skillName) { private SkillType extractSkill(CommandSender sender, String skillName) {
if (CommandUtils.isInvalidSkill(sender, skillName)) { if (CommandUtils.isInvalidSkill(sender, skillName)) {
return false; return null;
} }
skill = SkillType.getSkill(skillName); SkillType skill = SkillType.getSkill(skillName);
if (CommandUtils.isChildSkill(sender, skill)) { if (CommandUtils.isChildSkill(sender, skill)) {
return false; return null;
} }
return true; return skill;
} }
} }