Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-11-27 04:55:37 +01:00
Code Issues Projects Releases Wiki Activity

Fix wibbly wobbly timey wimey stuff.

Browse Source 
Fixes WORLDGUARD-3527.
This commit is contained in:
wizjany 2015-08-02 16:05:47 -04:00
parent d320356045
commit 0ddc011a3c
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/sk89q/worldguard/session/handler/TimeLockFlag.java
View File

@ -31,12 +31,10 @@
public class TimeLockFlag extends FlagValueChangeHandler<String> {
private Long time;
private boolean relative;
private Long initialTime;
private boolean initialRelative;
Pattern timePattern = Pattern.compile("(\\+|-)?\\d+");
private static Pattern timePattern = Pattern.compile("(\\+|-)?\\d+");
public TimeLockFlag(Session session) {
super(session, DefaultFlag.TIME_LOCK);
@ -45,27 +43,26 @@ public TimeLockFlag(Session session) {
private void updatePlayerTime(Player player, @Nullable String value) {
// store settings, regardless of if we change anything
initialRelative = player.isPlayerTimeRelative();
initialTime = player.getPlayerTime();
initialTime = player.getPlayerTimeOffset();
if (value == null || !timePattern.matcher(value).matches()) {
// invalid input
return;
}
boolean relative;
if (value.startsWith("+") || value.startsWith("-")) {
relative = true;
} else {
relative = false;
}
time = Long.valueOf(value);
if (!relative && (time < 0L || time > 24000L)) { // invalid time, reset to 0
time = 0L;
}
Long time = Long.valueOf(value);
// if (!relative && (time < 0L || time > 24000L)) { // invalid time, reset to 0
// time = 0L;
// }
player.setPlayerTime(time, relative);
}
@Override
protected void onInitialValue(Player player, ApplicableRegionSet set, String value) {
initialTime = player.getPlayerTime();
initialRelative = player.isPlayerTimeRelative();
updatePlayerTime(player, value);
}