Fix Time requirement.

DenizenScript · Mar 14, 2013 · 798ffef · 798ffef
1 parent 7986edb
commit 798ffef
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/TimeRequirement.java b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/TimeRequirement.java
@@ -24,13 +24,14 @@ public boolean check(RequirementsContext context, List<String> args) throws Requ
 
 		long worldTime = context.getNPC().getEntity().getWorld().getTime();
 
-		if (time.equals(Time.DAY) && worldTime >= 0 && worldTime < 12000)
+
+		if (time.equals(Time.DAY) && (worldTime <= 12500))
 			outcome = true;
-		else if (time.equals(Time.DUSK) && worldTime >= 12000 && worldTime < 23800)
+		else if (time.equals(Time.NIGHT) && (worldTime >= 13500 && worldTime <= 23000))
 			outcome = true;
-		else if (time.equals(Time.NIGHT) && worldTime >= 23800 && worldTime < 22200)
+		else if (time.equals(Time.DAWN) && (worldTime >= 23000))
 			outcome = true;
-		else if (time.equals(Time.DAWN) && worldTime >= 22200 && worldTime < 24000)
+		else if (time.equals(Time.DUSK) && worldTime >= 12500 && worldTime <= 13500)
 			outcome = true;
 
 		return outcome;

diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/PlayerTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/PlayerTags.java
@@ -412,10 +412,16 @@ else if (subType.equalsIgnoreCase("CURRENCY"))
         } else if (type.equalsIgnoreCase("TIME")) {
             event.setReplaced(String.valueOf(p.getPlayerTime()));
             if (subType.equalsIgnoreCase("PERIOD"))
-                if (p.getPlayerTime() < 13500 || p.getPlayerTime() > 23000)
+            {
+                if (p.getPlayerTime() >= 23000)
+                    event.setReplaced("dawn");
+                else if (p.getPlayerTime() >= 13500)
+            		event.setReplaced("night");
+                else if (p.getPlayerTime() >= 12500)
+                    event.setReplaced("dusk");
+                else
                     event.setReplaced("day");
-                else if (p.getPlayerTime() > 13500)
-                    event.setReplaced("night");
+            }
 
         } else if (type.equalsIgnoreCase("WEATHER")) {
             if (p.getWorld().hasStorm())