Core: Fix mistakes introduced in df32b341a5

src/server/game/Globals/ObjectMgr.cpp

@@ -612,15 +612,6 @@ void ObjectMgr::LoadCreatureTemplateModels()
         if (!modelInfo)
             TC_LOG_ERROR("sql.sql", "No model data exist for `CreatureDisplayID` = %u listed by creature (Entry: %u).", creatureDisplayId, creatureId);
 
-        /// if not set custom creature scale then load scale from CreatureDisplayInfo.dbc
-        if (cInfo->scale <= 0.0f)
-        {
-            if (displayEntry)
-                const_cast<CreatureTemplate*>(cInfo)->scale = displayEntry->CreatureModelScale;
-            else
-                const_cast<CreatureTemplate*>(cInfo)->scale = 1.0f;
-        }
-
         const_cast<CreatureTemplate*>(cInfo)->Models.emplace_back(creatureDisplayId, idx, probability);
 
         ++count;

src/server/scripts/Kalimdor/Firelands/boss_lord_rhyolith.cpp

@@ -906,7 +906,8 @@ struct npc_rhyolith_volcano : public NullCreatureAI
             case ACTION_ACTIVATE_VOLCANO:
                 me->UpdateEntry(NPC_VOLCANO_HEATED, nullptr, false);
                 if (CreatureTemplate const* transformTemplate = sObjectMgr->GetCreatureTemplate(NPC_VOLCANO_HEATED))
-                    me->SetDisplayFromModel(1);
+                    if (CreatureModel const* model = transformTemplate->GetModelByIdx(1))
+                        me->SetDisplayId(model->CreatureDisplayID);
                 _events.ScheduleEvent(EVENT_ERUPTION, 5s);
                 break;
             case ACTION_SCHEDULE_MAGMA_FLOW: