Merge pull request #100 from iquelli/game-start-time

World time is now consistent with game time
TiagoFar78 · Mar 30, 2024 · a7d3c21 · a7d3c21
2 parents 0d87a8c + a9eab6f
commit a7d3c21
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/main/java/net/tiagofar78/prisonescape/bukkit/BukkitWorldEditor.java b/src/main/java/net/tiagofar78/prisonescape/bukkit/BukkitWorldEditor.java
@@ -15,6 +15,8 @@ public class BukkitWorldEditor {
 
     private static final int SIGN_INDEX = 1;
     private static final World WORLD = Bukkit.getWorld(ConfigManager.getInstance().getWorldName());
+    private static final int DAY_START_TIME = 0;
+    private static final int NIGHT_START_TIME = 13000;
 
     public static void addSignAboveVault(PrisonEscapeLocation location, String text) {
         Location bukkitLocation = new Location(WORLD, location.getX(), location.getY() + 1, location.getZ());
@@ -39,4 +41,12 @@ public static void deleteVaultAndRespectiveSign(PrisonEscapeLocation location) {
         signLocation.getBlock().setType(Material.AIR);
     }
 
+    public static void changeTimeToDay() {
+        WORLD.setTime(DAY_START_TIME);
+    }
+
+    public static void changeTimeToNight() {
+        WORLD.setTime(NIGHT_START_TIME);
+    }
+
 }
diff --git a/src/main/java/net/tiagofar78/prisonescape/game/PrisonEscapeGame.java b/src/main/java/net/tiagofar78/prisonescape/game/PrisonEscapeGame.java
@@ -4,6 +4,7 @@
 import net.tiagofar78.prisonescape.bukkit.BukkitMessageSender;
 import net.tiagofar78.prisonescape.bukkit.BukkitScheduler;
 import net.tiagofar78.prisonescape.bukkit.BukkitTeleporter;
+import net.tiagofar78.prisonescape.bukkit.BukkitWorldEditor;
 import net.tiagofar78.prisonescape.game.phases.Finished;
 import net.tiagofar78.prisonescape.game.phases.Phase;
 import net.tiagofar78.prisonescape.game.phases.Waiting;
@@ -339,6 +340,7 @@ private void startDay() {
 
         _dayPeriod = DayPeriod.DAY;
         _currentDay++;
+        BukkitWorldEditor.changeTimeToDay();
 
         _prison.reloadChests();
 
@@ -364,6 +366,7 @@ private void startNight() {
         }
 
         _dayPeriod = DayPeriod.NIGHT;
+        BukkitWorldEditor.changeTimeToNight();
 
         for (PrisonEscapePlayer player : _playersOnLobby) {
             MessageLanguageManager messages = MessageLanguageManager.getInstanceByPlayer(player.getName());