mirror of
https://github.com/mangosfour/server.git
synced 2025-12-14 07:37:01 +00:00
[9682] Clarify areatrigger related tables loading errors.
(based on 330 commit 71c1d67) Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
parent
dd2dda62a5
commit
fbf530cb50
2 changed files with 38 additions and 37 deletions
|
|
@ -5001,12 +5001,11 @@ void ObjectMgr::LoadQuestAreaTriggers()
|
||||||
AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(trigger_ID);
|
AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(trigger_ID);
|
||||||
if (!atEntry)
|
if (!atEntry)
|
||||||
{
|
{
|
||||||
sLog.outErrorDb("Area trigger (ID:%u) does not exist in `AreaTrigger.dbc`.",trigger_ID);
|
sLog.outErrorDb("Table `areatrigger_involvedrelation` has area trigger (ID: %u) not listed in `AreaTrigger.dbc`.", trigger_ID);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
Quest const* quest = GetQuestTemplate(quest_ID);
|
Quest const* quest = GetQuestTemplate(quest_ID);
|
||||||
|
|
||||||
if (!quest)
|
if (!quest)
|
||||||
{
|
{
|
||||||
sLog.outErrorDb("Table `areatrigger_involvedrelation` has record (id: %u) for not existing quest %u",trigger_ID,quest_ID);
|
sLog.outErrorDb("Table `areatrigger_involvedrelation` has record (id: %u) for not existing quest %u",trigger_ID,quest_ID);
|
||||||
|
|
@ -5065,7 +5064,7 @@ void ObjectMgr::LoadTavernAreaTriggers()
|
||||||
AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(Trigger_ID);
|
AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(Trigger_ID);
|
||||||
if (!atEntry)
|
if (!atEntry)
|
||||||
{
|
{
|
||||||
sLog.outErrorDb("Area trigger (ID:%u) does not exist in `AreaTrigger.dbc`.",Trigger_ID);
|
sLog.outErrorDb("Table `areatrigger_tavern` has area trigger (ID:%u) not listed in `AreaTrigger.dbc`.", Trigger_ID);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -5110,9 +5109,10 @@ void ObjectMgr::LoadAreaTriggerScripts()
|
||||||
AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(Trigger_ID);
|
AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(Trigger_ID);
|
||||||
if (!atEntry)
|
if (!atEntry)
|
||||||
{
|
{
|
||||||
sLog.outErrorDb("Area trigger (ID:%u) does not exist in `AreaTrigger.dbc`.",Trigger_ID);
|
sLog.outErrorDb("Table `areatrigger_scripts` has area trigger (ID:%u) not listed in `AreaTrigger.dbc`.", Trigger_ID);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
mAreaTriggerScripts[Trigger_ID] = GetScriptId(scriptName);
|
mAreaTriggerScripts[Trigger_ID] = GetScriptId(scriptName);
|
||||||
} while( result->NextRow() );
|
} while( result->NextRow() );
|
||||||
|
|
||||||
|
|
@ -5530,7 +5530,7 @@ void ObjectMgr::LoadAreaTriggerTeleports()
|
||||||
AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(Trigger_ID);
|
AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(Trigger_ID);
|
||||||
if (!atEntry)
|
if (!atEntry)
|
||||||
{
|
{
|
||||||
sLog.outErrorDb("Area trigger (ID:%u) does not exist in `AreaTrigger.dbc`.",Trigger_ID);
|
sLog.outErrorDb("Table `areatrigger_teleport` has area trigger (ID:%u) not listed in `AreaTrigger.dbc`.", Trigger_ID);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -5539,16 +5539,17 @@ void ObjectMgr::LoadAreaTriggerTeleports()
|
||||||
ItemPrototype const *pProto = GetItemPrototype(at.requiredItem);
|
ItemPrototype const *pProto = GetItemPrototype(at.requiredItem);
|
||||||
if (!pProto)
|
if (!pProto)
|
||||||
{
|
{
|
||||||
sLog.outError("Key item %u does not exist for trigger %u, removing key requirement.", at.requiredItem, Trigger_ID);
|
sLog.outError("Table `areatrigger_teleport` has not existed key item %u for trigger %u, removing key requirement.", at.requiredItem, Trigger_ID);
|
||||||
at.requiredItem = 0;
|
at.requiredItem = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (at.requiredItem2)
|
if (at.requiredItem2)
|
||||||
{
|
{
|
||||||
ItemPrototype const *pProto = GetItemPrototype(at.requiredItem2);
|
ItemPrototype const *pProto = GetItemPrototype(at.requiredItem2);
|
||||||
if(!pProto)
|
if(!pProto)
|
||||||
{
|
{
|
||||||
sLog.outError("Second item %u not exist for trigger %u, remove key requirement.", at.requiredItem2, Trigger_ID);
|
sLog.outError("Table `areatrigger_teleport` has not existed second key item %u for trigger %u, remove key requirement.", at.requiredItem2, Trigger_ID);
|
||||||
at.requiredItem2 = 0;
|
at.requiredItem2 = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5558,7 +5559,7 @@ void ObjectMgr::LoadAreaTriggerTeleports()
|
||||||
ItemPrototype const *pProto = GetItemPrototype(at.heroicKey);
|
ItemPrototype const *pProto = GetItemPrototype(at.heroicKey);
|
||||||
if (!pProto)
|
if (!pProto)
|
||||||
{
|
{
|
||||||
sLog.outError("Heroic key item %u not exist for trigger %u, remove key requirement.", at.heroicKey, Trigger_ID);
|
sLog.outError("Table `areatrigger_teleport` has not existed heroic key item %u for trigger %u, remove key requirement.", at.heroicKey, Trigger_ID);
|
||||||
at.heroicKey = 0;
|
at.heroicKey = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5568,7 +5569,7 @@ void ObjectMgr::LoadAreaTriggerTeleports()
|
||||||
ItemPrototype const *pProto = GetItemPrototype(at.heroicKey2);
|
ItemPrototype const *pProto = GetItemPrototype(at.heroicKey2);
|
||||||
if (!pProto)
|
if (!pProto)
|
||||||
{
|
{
|
||||||
sLog.outError("Heroic second key item %u not exist for trigger %u, remove key requirement.", at.heroicKey2, Trigger_ID);
|
sLog.outError("Table `areatrigger_teleport` has not existed heroic second key item %u for trigger %u, remove key requirement.", at.heroicKey2, Trigger_ID);
|
||||||
at.heroicKey2 = 0;
|
at.heroicKey2 = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5578,7 +5579,7 @@ void ObjectMgr::LoadAreaTriggerTeleports()
|
||||||
QuestMap::iterator qReqItr = mQuestTemplates.find(at.requiredQuest);
|
QuestMap::iterator qReqItr = mQuestTemplates.find(at.requiredQuest);
|
||||||
if (qReqItr == mQuestTemplates.end())
|
if (qReqItr == mQuestTemplates.end())
|
||||||
{
|
{
|
||||||
sLog.outErrorDb("Required Quest %u not exist for trigger %u, remove quest done requirement.",at.requiredQuest,Trigger_ID);
|
sLog.outErrorDb("Table `areatrigger_teleport` has not existed required quest %u for trigger %u, remove quest done requirement.",at.requiredQuest,Trigger_ID);
|
||||||
at.requiredQuest = 0;
|
at.requiredQuest = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5588,7 +5589,7 @@ void ObjectMgr::LoadAreaTriggerTeleports()
|
||||||
QuestMap::iterator qReqItr = mQuestTemplates.find(at.requiredQuestHeroic);
|
QuestMap::iterator qReqItr = mQuestTemplates.find(at.requiredQuestHeroic);
|
||||||
if (qReqItr == mQuestTemplates.end())
|
if (qReqItr == mQuestTemplates.end())
|
||||||
{
|
{
|
||||||
sLog.outErrorDb("Required Quest %u not exist for trigger %u, remove quest done requirement.",at.requiredQuestHeroic,Trigger_ID);
|
sLog.outErrorDb("Table `areatrigger_teleport` has not existed required heroic quest %u for trigger %u, remove quest done requirement.",at.requiredQuestHeroic,Trigger_ID);
|
||||||
at.requiredQuestHeroic = 0;
|
at.requiredQuestHeroic = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5596,13 +5597,13 @@ void ObjectMgr::LoadAreaTriggerTeleports()
|
||||||
MapEntry const* mapEntry = sMapStore.LookupEntry(at.target_mapId);
|
MapEntry const* mapEntry = sMapStore.LookupEntry(at.target_mapId);
|
||||||
if (!mapEntry)
|
if (!mapEntry)
|
||||||
{
|
{
|
||||||
sLog.outErrorDb("Area trigger (ID:%u) target map (ID: %u) does not exist in `Map.dbc`.",Trigger_ID,at.target_mapId);
|
sLog.outErrorDb("Table `areatrigger_teleport` has not existed target map (ID: %u) for Area trigger (ID:%u).", at.target_mapId, Trigger_ID);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (at.target_X==0 && at.target_Y==0 && at.target_Z==0)
|
if (at.target_X==0 && at.target_Y==0 && at.target_Z==0)
|
||||||
{
|
{
|
||||||
sLog.outErrorDb("Area trigger (ID:%u) target coordinates not provided.",Trigger_ID);
|
sLog.outErrorDb("Table `areatrigger_teleport` has area trigger (ID:%u) without target coordinates.",Trigger_ID);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "9681"
|
#define REVISION_NR "9682"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue