sindoring/moonwell-core-vanilla
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update gameobject template data. (#370)

Browse Source
This commit is contained in:
ratkosrb
2020-02-16 18:40:12 +02:00
committed by GitHub
parent 9b78954601
commit a683100fcc
18 changed files with 1284 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/ScriptMgr.cpp
+40 -3
View File
@@ -405,9 +405,7 @@ void ScriptMgr::LoadScripts(ScriptMapMap& scripts, char const* tablename)
if (info->type == GAMEOBJECT_TYPE_FISHINGNODE ||
info->type == GAMEOBJECT_TYPE_FISHINGHOLE ||
info->type == GAMEOBJECT_TYPE_DOOR ||
info->type == GAMEOBJECT_TYPE_BUTTON ||
info->type == GAMEOBJECT_TYPE_TRAP)
info->type == GAMEOBJECT_TYPE_DOOR)
{
sLog.outErrorDb("Table `%s` have gameobject type (%u) unsupported by command SCRIPT_COMMAND_RESPAWN_GAMEOBJECT for script id %u", tablename, info->id, tmp.id);
continue;
@@ -1192,6 +1190,45 @@ void ScriptMgr::LoadScripts(ScriptMapMap& scripts, char const* tablename)
}
break;
}
case SCRIPT_COMMAND_DESPAWN_GAMEOBJECT:
{
if (tmp.GetGOGuid()) // cant check when using buddy\source\target instead
{
GameObjectData const* data = sObjectMgr.GetGOData(tmp.GetGOGuid());
if (!data)
{
if (!sObjectMgr.IsExistingGameObjectGuid(tmp.GetGOGuid()))
{
sLog.outErrorDb("Table `%s` has invalid gameobject (GUID: %u) in SCRIPT_COMMAND_DESPAWN_GAMEOBJECT for script id %u", tablename, tmp.GetGOGuid(), tmp.id);
continue;
}
else
{
DisableScriptAction(tmp);
break;
}
}
}
break;
}
case SCRIPT_COMMAND_LOAD_GAMEOBJECT:
{
GameObjectData const* data = sObjectMgr.GetGOData(tmp.GetGOGuid());
if (!data)
{
if (!sObjectMgr.IsExistingGameObjectGuid(tmp.GetGOGuid()))
{
sLog.outErrorDb("Table `%s` has invalid gameobject (GUID: %u) in SCRIPT_COMMAND_LOAD_GAMEOBJECT for script id %u", tablename, tmp.GetGOGuid(), tmp.id);
continue;
}
else
{
DisableScriptAction(tmp);
break;
}
}
break;
}
}
if (scripts.find(tmp.id) == scripts.end())