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

Add '@' prefix to time, to fix the time, rather than relative.

Browse Source
This commit is contained in:
KHobbits 2011-08-10 15:06:42 +01:00
parent 47c8217511
commit 19595c5847
1 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Essentials/src/com/earth2me/essentials/commands/Commandptime.java
View File

@ -23,9 +23,10 @@ public class Commandptime extends EssentialsCommand
public static final ChatColor colorLogo = ChatColor.GREEN; public static final ChatColor colorLogo = ChatColor.GREEN;
public static final ChatColor colorHighlight1 = ChatColor.AQUA; public static final ChatColor colorHighlight1 = ChatColor.AQUA;
public static final ChatColor colorBad = ChatColor.RED; public static final ChatColor colorBad = ChatColor.RED;
public static final Set<String> getAliases = new HashSet<String>(); public static final Set<String> getAliases = new HashSet<String>();
static {
static
{
getAliases.add("get"); getAliases.add("get");
getAliases.add("list"); getAliases.add("list");
getAliases.add("show"); getAliases.add("show");
@ -65,6 +66,13 @@ public class Commandptime extends EssentialsCommand
Long ticks; Long ticks;
// Parse the target time int ticks from args[0] // Parse the target time int ticks from args[0]
String timeParam = args[0]; String timeParam = args[0];
Boolean relative = true;
if (timeParam.startsWith("@"))
{
relative = false;
timeParam = timeParam.substring(1);
}
if (getAliases.contains(timeParam)) if (getAliases.contains(timeParam))
{ {
getUsersTime(sender, users); getUsersTime(sender, users);
@ -86,7 +94,7 @@ public class Commandptime extends EssentialsCommand
} }
} }
setUsersTime(sender, users, ticks); setUsersTime(sender, users, ticks, relative);
} }
/** /**
@ -98,27 +106,35 @@ public class Commandptime extends EssentialsCommand
{ {
final User user = users.iterator().next(); final User user = users.iterator().next();
//Todo: Find out why this doesn't work?
// if (user.isPlayerTimeRelative())
if (user.getPlayerTimeOffset() == 0) if (user.getPlayerTimeOffset() == 0)
{ {
sender.sendMessage(colorDefault + user.getName() + "'s time is normal. Time is the same as on the server."); sender.sendMessage(colorDefault + user.getName() + "'s time is normal. Time is the same as on the server.");
} }
else else
{ {
sender.sendMessage(colorDefault + user.getName() + "'s time is fixed to: " + DescParseTickFormat.format(user.getPlayerTime())); String time = DescParseTickFormat.format(user.getPlayerTime());
if (!user.isPlayerTimeRelative())
{
time = "fixed to " + time;
}
sender.sendMessage(colorDefault + user.getName() + "'s time is " + time);
} }
return; return;
} }
sender.sendMessage(colorDefault + "These players have fixed time:"); sender.sendMessage(colorDefault + "These players have their own time:");
for (User user : users) for (User user : users)
{ {
//if (!user.isPlayerTimeRelative()) //if (!user.isPlayerTimeRelative())
if (user.getPlayerTimeOffset() != 0) if (user.getPlayerTimeOffset() != 0)
{ {
sender.sendMessage(colorDefault + user.getName() + ": " + DescParseTickFormat.format(user.getPlayerTime())); String time = DescParseTickFormat.format(user.getPlayerTime());
if (!user.isPlayerTimeRelative())
{
time = "fixed to " + time;
}
sender.sendMessage(colorDefault + user.getName() + "'s time is " + time);
} }
} }
return; return;
@ -127,7 +143,7 @@ public class Commandptime extends EssentialsCommand
/** /**
* Used to set the time and inform of the change * Used to set the time and inform of the change
*/ */
private void setUsersTime(final CommandSender sender, final Collection<User> users, final Long ticks) private void setUsersTime(final CommandSender sender, final Collection<User> users, final Long ticks, Boolean relative)
{ {
// Update the time // Update the time
if (ticks == null) if (ticks == null)
@ -143,10 +159,15 @@ public class Commandptime extends EssentialsCommand
// Set // Set
for (User user : users) for (User user : users)
{ {
final World world = user.getWorld();
long time = user.getPlayerTime(); long time = user.getPlayerTime();
time -= time % 24000; time -= time % 24000;
final World world = user.getWorld(); time += 24000 + ticks;
user.setPlayerTime(time + 24000 + ticks - world.getTime(), true); if (relative)
{
time -= world.getTime();
}
user.setPlayerTime(time, relative);
} }
} }