Update to /time command:

Supports player time now.

New permissions:
essentials.time.world (if the user is allowed to change the time of the world)
essentials.time.player (if the user is allowed to change his own time)

Backwards incompatibility!
This commit is contained in:
snowleo 2011-06-23 13:31:23 +02:00
parent 7fc6d73241
commit ca9364d25b

View File

@ -15,20 +15,45 @@ public class Commandtime extends EssentialsCommand
} }
@Override @Override
public void run(Server server, User user, String commandLabel, String[] args) throws Exception public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
{ {
if (args.length < 1) if (args.length < 1)
{ {
throw new NotEnoughArgumentsException(); throw new NotEnoughArgumentsException();
} }
World world = user.getWorld(); if (user.isAuthorized("essentials.time.world"))
{
final World world = user.getWorld();
charge(user); charge(user);
setWorldTime(world, args[0]); setWorldTime(world, args[0]);
}
else
{
if (user.isAuthorized("essentials.time.player"))
{
long time = user.getPlayerTime();
time -= time % 24000;
if ("day".equalsIgnoreCase(args[0]))
{
final World world = user.getWorld();
user.setPlayerTime(time + 24000 - world.getTime(), true);
return;
}
if ("night".equalsIgnoreCase(args[0]))
{
final World world = user.getWorld();
user.setPlayerTime(time + 37700 - world.getTime(), true);
return;
}
throw new Exception(Util.i18n("onlyDayNight"));
}
}
} }
@Override @Override
public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
{ {
if (args.length < 1) if (args.length < 1)
{ {
@ -42,10 +67,10 @@ public class Commandtime extends EssentialsCommand
sender.sendMessage(Util.i18n("timeSet")); sender.sendMessage(Util.i18n("timeSet"));
} }
private void setWorldTime(World world, String timeString) throws Exception private void setWorldTime(final World world, final String timeString) throws Exception
{ {
long time = world.getTime(); long time = world.getTime();
time = time - time % 24000; time -= time % 24000;
if ("day".equalsIgnoreCase(timeString)) if ("day".equalsIgnoreCase(timeString))
{ {
world.setTime(time + 24000); world.setTime(time + 24000);