Code cleanup; deprecated /nuble

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1271 e251c2fe-e539-e718-e476-b85c1f46cddb

3 files changed, 39 insertions, 77 deletions

diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandnuble.java b/Essentials/src/com/earth2me/essentials/commands/Commandnuble.java
deleted file mode 100644
index dc6ab3ac3..000000000
--- a/Essentials/src/com/earth2me/essentials/commands/Commandnuble.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import org.bukkit.Server;
-import com.earth2me.essentials.Essentials;
-import com.earth2me.essentials.User;
-
-
-public class Commandnuble extends EssentialsCommand
-{
-	public Commandnuble()
-	{
-		super("nuble");
-	}
-
-	@Override
-	public void run(Server server, Essentials parent, User user, String commandLabel, String[] args) throws Exception
-	{
-		user.charge(this);
-		user.sendMessage("§7Flight is allowed on this server.");
-	}
-}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandweather.java b/Essentials/src/com/earth2me/essentials/commands/Commandweather.java
index 2a8589694..b13eadb43 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandweather.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandweather.java
@@ -5,9 +5,10 @@ import com.earth2me.essentials.User;
 
 import org.bukkit.Server;
 
+
 public class Commandweather extends EssentialsCommand
 {
-        public Commandweather()
+	public Commandweather()
 	{
 		super("weather");
 	}
@@ -15,56 +16,41 @@ public class Commandweather extends EssentialsCommand
 	@Override
 	public void run(Server server, Essentials parent, User user, String commandLabel, String[] args) throws Exception
 	{
-                switch (args.length)
-                {
-                case 0:
-                        if (user.isAuthorized("essentials.weather"))
-                        {
-                             user.sendMessage("§cUsage: /" + commandLabel + " <storm/sun> [duration]");
-                             break;
-                        }
-                        user.sendMessage("§cYou are not allowed to change the weather");
-                        break;
-                case 1:
-                        if (user.isAuthorized("essentials.weather"))
-                        {
-                            if(args[0].equalsIgnoreCase("storm"))
-                            {
-                                user.getWorld().setStorm(true);
-                                user.sendMessage("§7You set the weather in your world to storm");
-                                break;
-                            }
-                            if(args[0].equalsIgnoreCase("sun"))
-                            {
-                                user.getWorld().setStorm(false);
-                                user.sendMessage("§7You set the weather in your world to sun");
-                                break;
-                            }
-                            user.sendMessage("§cUsage: /" + commandLabel + " <storm/sun> [duration]");
-                        }
-                        user.sendMessage("§cYou are not allowed to change the weather");
-                        break;
-                case 2:
-                        if (user.isAuthorized("essentials.weather"))
-                        {
-                            if(args[0].equalsIgnoreCase("storm"))
-                            {
-                                user.getWorld().setStorm(true);
-                                user.getWorld().setWeatherDuration(Integer.parseInt(args[1]) * 20);
-                                user.sendMessage("§7You set the weather in your world to storm for " +  args[1] + " seconds");
-                                break;
-                            }
-                            if(args[0].equalsIgnoreCase("sun"))
-                            {
-                                user.getWorld().setStorm(false);
-                                user.getWorld().setWeatherDuration(Integer.parseInt(args[1]) * 20);
-                                user.sendMessage("§7You set the weather in your world to sun for " +  args[1] + " seconds");
-                                break;
-                            }
-                            user.sendMessage("§cUsage: /" + commandLabel + " <storm/sun> [duration]");
-                        }
-                        user.sendMessage("§cYou are not allowed to change the weather");
-                        break;
-                }
-        }
+		switch (args.length)
+		{
+		case 0:
+			user.sendMessage("§cUsage: /" + commandLabel + " <storm/sun> [duration]");
+			break;
+		case 1:
+			if (args[0].equalsIgnoreCase("storm"))
+			{
+				user.getWorld().setStorm(true);
+				user.sendMessage("§7You set the weather in your world to storm");
+				break;
+			}
+			if (args[0].equalsIgnoreCase("sun"))
+			{
+				user.getWorld().setStorm(false);
+				user.sendMessage("§7You set the weather in your world to sun");
+				break;
+			}
+			user.sendMessage("§cUsage: /" + commandLabel + " <storm/sun> [duration]");
+		case 2:
+			if (args[0].equalsIgnoreCase("storm"))
+			{
+				user.getWorld().setStorm(true);
+				user.getWorld().setWeatherDuration(Integer.parseInt(args[1]) * 20);
+				user.sendMessage("§7You set the weather in your world to storm for " + args[1] + " seconds");
+				break;
+			}
+			if (args[0].equalsIgnoreCase("sun"))
+			{
+				user.getWorld().setStorm(false);
+				user.getWorld().setWeatherDuration(Integer.parseInt(args[1]) * 20);
+				user.sendMessage("§7You set the weather in your world to sun for " + args[1] + " seconds");
+				break;
+			}
+			user.sendMessage("§cUsage: /" + commandLabel + " <storm/sun> [duration]");
+		}
+	}
 }
diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml
index d0e4e2ce6..bbd843c90 100644
--- a/Essentials/src/plugin.yml
+++ b/Essentials/src/plugin.yml
@@ -168,9 +168,6 @@ commands:
     description: Change your nickname or that of another player.

     usage: /<command> <player> [nickname|off]

     aliases: [enick]

-  nuble:

-    description: Used by Nuble to request permission for takeoff.

-    usage: /<command> identify [id]

   pay:

     description: Pays another player from your balance

     usage: /<command> [player] [amount]