diff --git a/src/engine/objects/Mine.java b/src/engine/objects/Mine.java
index 204d0e16..dbd29bc4 100644
--- a/src/engine/objects/Mine.java
+++ b/src/engine/objects/Mine.java
@@ -311,13 +311,13 @@ public class Mine extends AbstractGameObject {
             mineOpenTime = LocalDateTime.now().withHour(mine.liveTime).withMinute(30).withSecond(0).withNano(0);
         }
 
-        if(LocalDateTime.now().isAfter(mineOpenTime.plusMinutes(30))){
-            writer.putLocalDateTime(mineOpenTime.plusDays(1));
-            writer.putLocalDateTime(mineOpenTime.plusMinutes(30).plusDays(1));
-        } else {
-            writer.putLocalDateTime(mineOpenTime);
-            writer.putLocalDateTime(mineOpenTime.plusMinutes(30));
+        LocalDateTime mineCloseTime = mineOpenTime.plusMinutes(30);
+        if(LocalDateTime.now().isAfter(mineCloseTime)){
+            mineOpenTime = mineOpenTime.plusDays(1);
+            mineCloseTime = mineCloseTime.plusDays(1);
         }
+        writer.putLocalDateTime(mineOpenTime);
+        writer.putLocalDateTime(mineCloseTime);
         writer.put(mine.isActive ? (byte) 0x01 : (byte) 0x00);
 
         Building mineTower = BuildingManager.getBuilding(mine.buildingID);
diff --git a/src/engine/server/world/WorldServer.java b/src/engine/server/world/WorldServer.java
index 3342bd22..0c122b57 100644
--- a/src/engine/server/world/WorldServer.java
+++ b/src/engine/server/world/WorldServer.java
@@ -230,11 +230,12 @@ public class WorldServer {
 				Thread hourlyJobThread = new Thread(new HourlyJobThread());
 				hourlyJobThread.setName("hourlyJob");
 				hourlyJobThread.start();
-				if(LocalDateTime.now().isAfter(LocalDateTime.now().withMinute(30).withSecond(0))) {
-					nextHourlyJobTime = LocalDateTime.now().withMinute(0).withSecond(1).plusHours(1);
-				}else{
-					nextHourlyJobTime = LocalDateTime.now().withMinute(30).withSecond(1);
-				}
+				//if(LocalDateTime.now().isAfter(LocalDateTime.now().withMinute(30).withSecond(0))) {
+				//	nextHourlyJobTime = LocalDateTime.now().withMinute(0).withSecond(0).plusHours(1);
+				//}else{
+				//	nextHourlyJobTime = LocalDateTime.now().withMinute(30).withSecond(0);
+				//}
+				nextHourlyJobTime = LocalDateTime.now().plusMinutes(1);
 			}
 
 			if (LocalDateTime.now().isAfter(nextWareHousePushTime)) {