Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-02-01 21:11:44 +01:00
Code Issues Projects Releases Wiki Activity

[trunk] weather / thunder refactor

Browse Source 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1277 e251c2fe-e539-e718-e476-b85c1f46cddb
This commit is contained in:
ementalo 2011-04-26 12:13:39 +00:00
parent 80eee83f10
commit 6a892fcfc1
2 changed files with 63 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
Essentials/src/com/earth2me/essentials/commands/Commandthunder.java
View File

@ -4,10 +4,12 @@ import com.earth2me.essentials.Essentials;
import com.earth2me.essentials.User;
import org.bukkit.Server;
import org.bukkit.World;
public class Commandthunder extends EssentialsCommand
{
public Commandthunder()
public Commandthunder()
{
super("thunder");
}
@ -15,56 +17,34 @@ public class Commandthunder 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.thunder"))
{
user.sendMessage("§cUsage: /" + commandLabel + " <true/false> [duration]");
break;
}
user.sendMessage("§cYou are not allowed to change the thunder");
break;
case 1:
if (user.isAuthorized("essentials.thunder"))
{
if(args[0].equalsIgnoreCase("true"))
{
user.getWorld().setThundering(true);
user.sendMessage("§7You enabled thunder in your world");
break;
}
if(args[0].equalsIgnoreCase("false"))
{
user.getWorld().setThundering(false);
user.sendMessage("§7You disabled thunder in your world");
break;
}
user.sendMessage("§cUsage: /" + commandLabel + " <true/false> [duration]");
}
user.sendMessage("§cYou are not allowed to change the thunder");
break;
case 2:
if (user.isAuthorized("essentials.thunder"))
{
if(args[0].equalsIgnoreCase("true"))
{
user.getWorld().setThundering(true);
user.getWorld().setWeatherDuration(Integer.parseInt(args[1]) * 20);
user.sendMessage("§7You enabled thunder in your world for " + args[1] + " seconds");
break;
}
if(args[0].equalsIgnoreCase("false"))
{
user.getWorld().setThundering(false);
user.getWorld().setWeatherDuration(Integer.parseInt(args[1]) * 20);
user.sendMessage("§7You disabled thunder in your world for " + args[1] + " seconds");
break;
}
user.sendMessage("§cUsage: /" + commandLabel + " <true/false> [duration]");
}
user.sendMessage("§cYou are not allowed to change the thunder");
break;
}
}
if (args.length < 1)
{
user.sendMessage("§cUsage: /" + commandLabel + " <true/false> [duration]");
return;
}
if (!user.isAuthorized(this))
{
user.sendMessage("§cThe power of the Thor has been denied to you");
return;
}
user.charge(this);
World world = user.getWorld();
boolean setThunder = args[0].equalsIgnoreCase("true");
if (!args[1].isEmpty() || args[1] != null)
{
world.setThundering(setThunder ? true : false);
world.setThunderDuration(Integer.parseInt(args[1]) * 20);
user.sendMessage("§7You " + (setThunder ? "enabled" : "disabled") + " thunder in your world for " + args[1] + " seconds");
}
else
{
world.setThundering(setThunder ? true : false);
user.sendMessage("§7You " + (setThunder ? "enabled" : "disabled") + " thunder in your world");
}
}
}

63
Essentials/src/com/earth2me/essentials/commands/Commandweather.java
View File

@ -4,6 +4,7 @@ import com.earth2me.essentials.Essentials;
import com.earth2me.essentials.User;
import org.bukkit.Server;
import org.bukkit.World;
public class Commandweather extends EssentialsCommand
@ -16,41 +17,37 @@ public class Commandweather extends EssentialsCommand
@Override
public void run(Server server, Essentials parent, User user, String commandLabel, String[] args) throws Exception
{
switch (args.length)
if (args.length < 1)
{
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]");
return;
}
if (!user.isAuthorized(this))
{
user.sendMessage("§cThe power of the sky has been denied to you");
return;
}
boolean isStorm = args[0].equalsIgnoreCase("storm");
World world = user.getWorld();
user.charge(this);
if (!args[1].isEmpty() || args[1] != null)
{
world.setStorm(isStorm ? true : false);
world.setWeatherDuration(Integer.parseInt(args[1]) * 20);
user.sendMessage("§7You set the weather to " + (isStorm ? "storm" : "sun") + " in your world for " + args[1] + " seconds");
return;
}
else
{
world.setStorm(isStorm ? true : false);
user.sendMessage("§7You set the weather to " + (isStorm ? "storm" : "sun") + " in your world");
return;
}
}
}