Core/CharacterHandler Fix scene at first login

conan513 · Aug 13, 2018 · 23d466a · 23d466a
1 parent 2be25f6
commit 23d466a
Showing 1 changed file with 21 additions and 17 deletions.
diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp
@@ -981,27 +981,31 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
             else if (cEntry->CinematicSequenceID)
                 pCurrChar->SendCinematicStart(cEntry->CinematicSequenceID);
             else if (ChrRacesEntry const* rEntry = sChrRacesStore.LookupEntry(pCurrChar->getRace()))
-                pCurrChar->SendCinematicStart(rEntry->CinematicSequenceID);
-            else
             {
-                switch (pCurrChar->getRace())
+                if (rEntry->CinematicSequenceID)
+                    pCurrChar->SendCinematicStart(rEntry->CinematicSequenceID);
+                else
                 {
-//                    case RACE_HIGHMOUNTAIN_TAUREN:
-//                        pCurrChar->GetSceneMgr().PlayScene(1901);
-//                        break;
-                    case RACE_NIGHTBORNE:
-                        pCurrChar->GetSceneMgr().PlayScene(1900);
-                        break;
-                    case RACE_LIGHTFORGED_DRAENEI:
-                        pCurrChar->GetSceneMgr().PlayScene(1902);
-                        break;
-                    case RACE_VOID_ELF:
-                        pCurrChar->GetSceneMgr().PlayScene(1903);
-                        break;
-                    default:
-                        break;
+                    switch (pCurrChar->getRace())
+                    {
+//                      case RACE_HIGHMOUNTAIN_TAUREN:
+//                          pCurrChar->GetSceneMgr().PlayScene(1901);
+//                          break;
+                        case RACE_NIGHTBORNE:
+                            pCurrChar->GetSceneMgr().PlayScene(1900);
+                            break;
+                        case RACE_LIGHTFORGED_DRAENEI:
+                            pCurrChar->GetSceneMgr().PlayScene(1902);
+                            break;
+                        case RACE_VOID_ELF:
+                            pCurrChar->GetSceneMgr().PlayScene(1903);
+                            break;
+                        default:
+                            break;
+                    }
                 }
             }
+
             // send new char string if not empty
             if (!sWorld->GetNewCharString().empty())
                 chH.PSendSysMessage("%s", sWorld->GetNewCharString().c_str());