EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-11-04 11:03:43 +01:00
Code Issues Projects Releases Wiki Activity

Removing redundancy in most commands

Browse Source
This commit is contained in:
nossr50
2012-02-28 11:17:54 -08:00
parent e31aea3492
commit 1281843d45
20 changed files with 2 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/gmail/nossr50/commands/general/AddlevelsCommand.java
View File

@@ -34,11 +34,6 @@ public class AddlevelsCommand implements CommandExecutor{
return true;
}
if (!LoadProperties.addlevelsEnable) {
sender.sendMessage("This command is not enabled.");
return true;
}
if (!(sender instanceof Player)) {
if (args.length < 2) {
System.out.println("Usage is /addlevels playername skillname levels");

5
src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java
View File

@@ -33,11 +33,6 @@ public class AddxpCommand implements CommandExecutor {
return true;
}
if (!LoadProperties.addxpEnable) {
sender.sendMessage("This command is not enabled.");
return true;
}
if (!(sender instanceof Player)) {
if (args.length < 2) {
// No console aliasing yet

2
src/main/java/com/gmail/nossr50/commands/general/ClearmyspawnCommand.java
View File

@@ -20,7 +20,7 @@ public class ClearmyspawnCommand implements CommandExecutor {
sender.sendMessage("This command is not enabled.");
return true;
}
if (!(sender instanceof Player)) {
sender.sendMessage("This command does not support console useage.");
return true;

4
src/main/java/com/gmail/nossr50/commands/general/McstatsCommand.java
View File

@@ -25,10 +25,6 @@ public class McstatsCommand implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!LoadProperties.mcstatsEnable) {
sender.sendMessage("This command is not enabled.");
return true;
}
Player player = null;
if (sender instanceof Player) {

5
src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.java
View File

@@ -34,11 +34,6 @@ public class MmoeditCommand implements CommandExecutor {
return true;
}
if (!LoadProperties.mmoeditEnable) {
sender.sendMessage("This command is not enabled.");
return true;
}
if (!(sender instanceof Player)) {
if (args.length < 2) {
System.out.println("Usage is /mmoedit playername skillname newvalue");

4
src/main/java/com/gmail/nossr50/commands/general/WhoisCommand.java
View File

@@ -25,10 +25,6 @@ public class WhoisCommand implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!LoadProperties.whoisEnable) {
sender.sendMessage("This command is not enabled.");
return true;
}
Player player = null;
if (sender instanceof Player) {

4
src/main/java/com/gmail/nossr50/commands/general/XprateCommand.java
View File

@@ -19,10 +19,6 @@ public class XprateCommand implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!LoadProperties.xprateEnable) {
sender.sendMessage("This command is not enabled.");
return true;
}
if (!(sender instanceof Player)) {
if(args.length <= 0)

5
src/main/java/com/gmail/nossr50/commands/mc/McabilityCommand.java
View File

@@ -25,11 +25,6 @@ public class McabilityCommand implements CommandExecutor {
return true;
}
if (!LoadProperties.mcabilityEnable) {
sender.sendMessage("This command is not enabled.");
return true;
}
if (!(sender instanceof Player)) {
sender.sendMessage("This command does not support console useage.");
return true;

4
src/main/java/com/gmail/nossr50/commands/mc/MccCommand.java
View File

@@ -13,10 +13,6 @@ import com.gmail.nossr50.locale.mcLocale;
public class MccCommand implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!LoadProperties.mccEnable) {
sender.sendMessage("This command is not enabled.");
return true;
}
if (!(sender instanceof Player)) {
sender.sendMessage("This command does not support console useage.");

4
src/main/java/com/gmail/nossr50/commands/mc/McgodCommand.java
View File

@@ -15,10 +15,6 @@ import com.gmail.nossr50.locale.mcLocale;
public class McgodCommand implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!LoadProperties.mcgodEnable) {
sender.sendMessage("This command is not enabled.");
return true;
}
if (!(sender instanceof Player)) {
sender.sendMessage("This command does not support console useage.");

4
src/main/java/com/gmail/nossr50/commands/mc/McmmoCommand.java
View File

@@ -14,10 +14,6 @@ public class McmmoCommand implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!LoadProperties.mcmmoEnable) {
sender.sendMessage("This command is not enabled.");
return true;
}
if (!(sender instanceof Player)) {
sender.sendMessage("This command does not support console useage.");

4
src/main/java/com/gmail/nossr50/commands/mc/McrefreshCommand.java
View File

@@ -22,10 +22,6 @@ public class McrefreshCommand implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!LoadProperties.mcrefreshEnable) {
sender.sendMessage("This command is not enabled.");
return true;
}
if (!(sender instanceof Player)) {
sender.sendMessage("This command does not support console useage.");

52
src/main/java/com/gmail/nossr50/commands/mc/Mcremove.java
View File

@@ -1,52 +0,0 @@
package com.gmail.nossr50.commands.mc;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.gmail.nossr50.mcPermissions;
import com.gmail.nossr50.config.LoadProperties;
import com.gmail.nossr50.locale.mcLocale;
public class Mcremove implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
Player player = null;
if (sender instanceof Player) {
player = (Player) sender;
}
if (player != null && !mcPermissions.getInstance().mcremove(player)) {
player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
return true;
}
if (!LoadProperties.mcremoveEnable) {
sender.sendMessage("This command is not enabled.");
return true;
}
if (!(sender instanceof Player)) {
sender.sendMessage("This command does not support console useage.");
return true;
}
if(args.length == 1)
{
sender.sendMessage("Correct usage is /mcremove [Player Name]");
}
//If the server is using MySQL
if(LoadProperties.useMySQL)
{
} else {
}
return true;
}
}

4
src/main/java/com/gmail/nossr50/commands/mc/MctopCommand.java
View File

@@ -20,10 +20,6 @@ import com.gmail.nossr50.skills.Skills;
public class MctopCommand implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!LoadProperties.mctopEnable) {
sender.sendMessage("This command is not enabled.");
return true;
}
if (!(sender instanceof Player)) {
sender.sendMessage("This command does not support console useage.");

4
src/main/java/com/gmail/nossr50/commands/party/AcceptCommand.java
View File

@@ -16,10 +16,6 @@ import com.gmail.nossr50.party.Party;
public class AcceptCommand implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!LoadProperties.acceptEnable) {
sender.sendMessage("This command is not enabled.");
return true;
}
if (!(sender instanceof Player)) {
sender.sendMessage("This command does not support console useage.");

4
src/main/java/com/gmail/nossr50/commands/party/InviteCommand.java
View File

@@ -23,10 +23,6 @@ public class InviteCommand implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!LoadProperties.inviteEnable) {
sender.sendMessage("This command is not enabled.");
return true;
}
if (!(sender instanceof Player)) {
sender.sendMessage("This command does not support console useage.");

4
src/main/java/com/gmail/nossr50/commands/party/PCommand.java
View File

@@ -26,10 +26,6 @@ public class PCommand implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!LoadProperties.partyEnable) {
sender.sendMessage("This command is not enabled.");
return true;
}
// Console message?
if (!(sender instanceof Player)) {

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

@@ -17,10 +17,6 @@ import com.gmail.nossr50.party.Party;
public class PartyCommand implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!LoadProperties.partyEnable) {
sender.sendMessage("This command is not enabled.");
return true;
}
if (!(sender instanceof Player)) {
sender.sendMessage("This command does not support console useage.");

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

@@ -22,10 +22,6 @@ public class PtpCommand implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!LoadProperties.ptpEnable) {
sender.sendMessage("This command is not enabled.");
return true;
}
if (!(sender instanceof Player)) {
sender.sendMessage("This command does not support console useage.");

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

@@ -296,6 +296,7 @@ public class mcMMO extends JavaPlugin
getCommand("woodcutting").setExecutor(new WoodcuttingCommand());
//Mc* commands
if(LoadProperties.mcremoveEnable) getCommand("mcremove").setExecutor(new McremoveCommand());
if(LoadProperties.mcabilityEnable) getCommand("mcability").setExecutor(new McabilityCommand());
if(LoadProperties.mccEnable) getCommand("mcc").setExecutor(new MccCommand());
if(LoadProperties.mcgodEnable) getCommand("mcgod").setExecutor(new McgodCommand());