From 3200dd9d15f1a4edc74c5ea7b29380d4513116e9 Mon Sep 17 00:00:00 2001
From: JappaWakka <jjlspeelman@outlook.com>
Date: Wed, 21 Jun 2023 19:28:35 +0200
Subject: [PATCH] Fix Daytimes when set by command

---
 P3D/Battle/BattleSystemV2/BattleScreen.vb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/P3D/Battle/BattleSystemV2/BattleScreen.vb b/P3D/Battle/BattleSystemV2/BattleScreen.vb
index 5db6080c4..c6fc849b0 100644
--- a/P3D/Battle/BattleSystemV2/BattleScreen.vb
+++ b/P3D/Battle/BattleSystemV2/BattleScreen.vb
@@ -872,7 +872,11 @@
 
             Level.Load("battle\" & levelfile)
             Level.MapName = SavedOverworld.Level.MapName
-            Level.DayTime = World.GetTime + 1
+            If World.setDaytime = Nothing Then
+                Level.DayTime = World.GetTime + 1
+            Else
+                Level.DayTime = World.GetTime
+            End If
         End Sub
 
 #End Region