Merge TrinityCore 3.3.5 to ElunaTrinityWotlk [skip ci]

Rochet2 · Rochet2 · commit 89e0c925ce31 · 2024-08-17T01:10:17.000Z
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp
@@ -142,7 +142,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
@@ -199,7 +199,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
`@@ -142,7 +142,7 @@ bool GameEventMgr::StartEvent(uint16 event_id, bool overwrite)`
`142`	`142`	`{`
`143`	`143`	`mGameEvent[event_id].start = GameTime::GetGameTime();`
`144`	`144`	`if (data.end <= data.start)`
`145`		`- data.end = data.start + data.length;`
	`145`	`+ data.end = data.start + data.length * MINUTE;`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`// When event is started, set its worldstate to current time`
`@@ -199,7 +199,7 @@ void GameEventMgr::StopEvent(uint16 event_id, bool overwrite)`
`199`	`199`	`{`
`200`	`200`	`data.start = GameTime::GetGameTime() - data.length * MINUTE;`
`201`	`201`	`if (data.end <= data.start)`
`202`		`- data.end = data.start + data.length;`
	`202`	`+ data.end = data.start + data.length * MINUTE;`
`203`	`203`	`}`
`204`	`204`	`else if (serverwide_evt)`
`205`	`205`	`{`