From 6d38ec7ffa9bec109d864a86a9e8738f9019bf7d Mon Sep 17 00:00:00 2001 From: Charles A Edwards Date: Tue, 23 Aug 2016 14:11:06 +0100 Subject: [PATCH] Server start up error fixes Server start up error fixes Misnaming of the creature_template table's column. Change to how the check is made on the creature_template table's UnitClass column. --- src/game/Object/ObjectMgr.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/game/Object/ObjectMgr.cpp b/src/game/Object/ObjectMgr.cpp index 0eefc5518..a7449c454 100644 --- a/src/game/Object/ObjectMgr.cpp +++ b/src/game/Object/ObjectMgr.cpp @@ -520,10 +520,10 @@ void ObjectMgr::LoadCreatureTemplates() if (!ok2) continue; - if (cInfo->UnitClass != difficultyInfo->UnitFlags) + if (cInfo->UnitClass != difficultyInfo->UnitClass) { - sLog.outErrorDb("Creature (Entry: %u, class %u) has different `UnitClass` in difficulty %u mode (Entry: %u, class %u).", - i, cInfo->UnitClass, diff + 1, cInfo->DifficultyEntry[diff], difficultyInfo->UnitClass); + sLog.outErrorDb("Creature (Entry: %u, class %u) has different `unit_class` in difficulty %u mode (Entry: %u, class %u).", + i, cInfo->UnitClass, diff + 1, cInfo->DifficultyEntry[diff], difficultyInfo->UnitClass); continue; } @@ -1197,7 +1197,7 @@ void ObjectMgr::LoadCreatureModelInfo() void ObjectMgr::LoadCreatureModelRace() { m_mCreatureModelRaceMap.clear(); // can be used for reload - + QueryResult* result = WorldDatabase.Query("SELECT modelid, racemask, creature_entry, modelid_racial FROM creature_model_race"); if (!result) @@ -9652,7 +9652,7 @@ void ObjectMgr::LoadGossipMenuItems(std::set& gossipScriptSet) m_mGossipMenuItemsMap.clear(); QueryResult* result = WorldDatabase.Query( - "SELECT menu_id, id, option_icon, option_text, option_id, npc_option_NpcFlags, " + "SELECT menu_id, id, option_icon, option_text, option_id, npc_option_npcflag, " "action_menu_id, action_poi_id, action_script_id, box_coded, box_money, box_text, " "condition_id " "FROM gossip_menu_option ORDER BY menu_id, id");