Merge branch 'master' into Playerbot

2024-12-05 00:08:25 +08:00
parent ba56317506 47580c0fab
commit 889b509313
121 changed files with 4818 additions and 1413 deletions
@@ -1063,7 +1063,7 @@ void WorldSession::HandlePlayerLoginFromDB(LoginQueryHolder const& holder)
    // Xinef: fix vendors falling of player vehicle, due to isBeingLoaded checks
    if (pCurrChar->IsInWorld())
    {
-        if (pCurrChar->GetMountBlockId() && !pCurrChar->HasAuraType(SPELL_AURA_MOUNTED))
+        if (pCurrChar->GetMountBlockId() && !pCurrChar->HasMountedAura())
        {
            pCurrChar->CastSpell(pCurrChar, pCurrChar->GetMountBlockId(), true);
            pCurrChar->SetMountBlockId(0);