Core/GameEvent: Fix game event end time duration overwriting (#30165)

Jildor · web-flow · commit bcb3ffa0efb5 · 2024-08-16T17:09:41.000+02:00
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp
@@ -139,7 +139,7 @@ bool GameEventMgr::StartEvent(uint16 event_id, bool overwrite)
         {
             mGameEvent[event_id].start = GameTime::GetGameTime();
             if (data.end <= data.start)
-                data.end = data.start + data.length;
+                data.end = data.start + data.length * MINUTE;
         }
 
         // When event is started, set its worldstate to current time
@@ -186,7 +186,7 @@ void GameEventMgr::StopEvent(uint16 event_id, bool overwrite)
     {
         data.start = GameTime::GetGameTime() - data.length * MINUTE;
         if (data.end <= data.start)
-            data.end = data.start + data.length;
+            data.end = data.start + data.length * MINUTE;
     }
     else if (serverwide_evt)
     {

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ bool GameEventMgr::StartEvent(uint16 event_id, bool overwrite)`
`139`	`139`	`{`
`140`	`140`	`mGameEvent[event_id].start = GameTime::GetGameTime();`
`141`	`141`	`if (data.end <= data.start)`
`142`		`- data.end = data.start + data.length;`
	`142`	`+ data.end = data.start + data.length * MINUTE;`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`// When event is started, set its worldstate to current time`
`@@ -186,7 +186,7 @@ void GameEventMgr::StopEvent(uint16 event_id, bool overwrite)`
`186`	`186`	`{`
`187`	`187`	`data.start = GameTime::GetGameTime() - data.length * MINUTE;`
`188`	`188`	`if (data.end <= data.start)`
`189`		`- data.end = data.start + data.length;`
	`189`	`+ data.end = data.start + data.length * MINUTE;`
`190`	`190`	`}`
`191`	`191`	`else if (serverwide_evt)`
`192`	`192`	`{`