Merge 3.3.5 to npcbots_3.3.5

trickerer · Aug 16, 2024 · 18ac20d · 18ac20d
2 parents d04ddd3 + bcb3ffa
commit 18ac20d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/sql/updates/world/3.3.5/2024_08_11_00_world.sql b/sql/updates/world/3.3.5/2024_08_11_00_world.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `smart_scripts` SET `target_type`=8 WHERE `entryorguid`=2711500 AND `source_type`=9 AND `id`=3 AND `link`=0;
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)
     {