浏览代码

Fixed mmoupdate not being useable from console

nossr50 13 年之前
父节点
当前提交
97fd3eaf64
共有 2 个文件被更改,包括 12 次插入11 次删除
  1. 1 0
      Changelog.txt
  2. 11 11
      src/main/java/com/gmail/nossr50/commands/general/MmoupdateCommand.java

+ 1 - 0
Changelog.txt

@@ -12,6 +12,7 @@ Version 1.3.06-dev
  + Added API functions for obtaining offline profiles & profiles via player names
  + Changed Archery's Daze to deal 4 DMG on proc (2 Hearts)
  + Changed /addlevel command to work for offline users
+ = Fixed mmoupdate not being useable from console
  ! Changed PlayerProfile constructor to always take a boolean
  ! Changed getPlayerProfile function to work for online & offline users
 

+ 11 - 11
src/main/java/com/gmail/nossr50/commands/general/MmoupdateCommand.java

@@ -16,24 +16,24 @@ import com.gmail.nossr50.runnables.SQLConversionTask;
 public class MmoupdateCommand implements CommandExecutor {
 	@Override
 	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
+	    Player player = null;
+	    
+	    if(sender instanceof Player) {
+	        player = (Player)sender;
+	    }
+	    
+		if (sender instanceof Player && !mcPermissions.getInstance().admin(player)) {
+			sender.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
 			return true;
 		}
-
-		Player player = (Player) sender;
-
-		if (!mcPermissions.getInstance().admin(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-		player.sendMessage(ChatColor.GRAY + "Starting conversion..."); //TODO: Needs more locale.
+		
+		sender.sendMessage(ChatColor.GRAY + "Starting conversion..."); //TODO: Needs more locale.
 		Users.clearUsers();
 		convertToMySQL();
 		for (Player x : Bukkit.getServer().getOnlinePlayers()) {
 			Users.addUser(x);
 		}
-		player.sendMessage(ChatColor.GREEN + "Conversion finished!"); //TODO: Needs more locale.
+		sender.sendMessage(ChatColor.GREEN + "Conversion finished!"); //TODO: Needs more locale.
 
 		return true;
 	}