From 127aff8573def6ab75859baf1f37126a01c6e516 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Wed, 17 Mar 2021 13:41:04 -0400 Subject: [PATCH] Core/Players: Update the location of the cinematic camera only if there is an active cinematic Port From (https://github.com/TrinityCore/TrinityCore/commit/72f99531b7cdfad1c3fca02d32e88f4ac2662043) --- Source/Game/Entities/Player/CinematicManager.cs | 4 ++-- Source/Game/Entities/Player/Player.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Game/Entities/Player/CinematicManager.cs b/Source/Game/Entities/Player/CinematicManager.cs index 8c2d5a4e8..b469dfbdc 100644 --- a/Source/Game/Entities/Player/CinematicManager.cs +++ b/Source/Game/Entities/Player/CinematicManager.cs @@ -30,10 +30,10 @@ namespace Game.Entities public uint m_cinematicDiff; public uint m_lastCinematicCheck; - CinematicSequencesRecord m_activeCinematic; + public CinematicSequencesRecord m_activeCinematic; public int m_activeCinematicCameraIndex; public uint m_cinematicLength; - List m_cinematicCamera; + public List m_cinematicCamera; Position m_remoteSightPosition; TempSummon m_CinematicObject; diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs index 3a57f43fd..518358973 100644 --- a/Source/Game/Entities/Player/Player.cs +++ b/Source/Game/Entities/Player/Player.cs @@ -335,7 +335,7 @@ namespace Game.Entities // Update cinematic location, if 500ms have passed and we're doing a cinematic now. _cinematicMgr.m_cinematicDiff += diff; - if (_cinematicMgr.m_activeCinematicCameraIndex != 0 && Time.GetMSTimeDiffToNow(_cinematicMgr.m_lastCinematicCheck) > 500) + if (_cinematicMgr.m_cinematicCamera != null && _cinematicMgr.m_activeCinematic != null && Time.GetMSTimeDiffToNow(_cinematicMgr.m_lastCinematicCheck) > 500) { _cinematicMgr.m_lastCinematicCheck = GameTime.GetGameTimeMS(); _cinematicMgr.UpdateCinematicLocation(diff);