Merge branch 'master' into Playerbot

# Conflicts:
#	src/server/game/Entities/GameObject/GameObject.h
This commit is contained in:
郑佩茹
2023-02-13 13:07:03 -07:00
312 changed files with 6400 additions and 4718 deletions
+1 -1
View File
@@ -664,7 +664,7 @@ void Map::ScriptsProcess()
case SCRIPT_COMMAND_CAST_SPELL:
{
// TODO: Allow gameobjects to be targets and casters
/// @todo: Allow gameobjects to be targets and casters
if (!source && !target)
{
LOG_ERROR("maps.script", "{} source and target objects are nullptr.", step.script->GetDebugInfo());
@@ -19,7 +19,7 @@
Battleground* ScriptMgr::CreateBattleground(BattlegroundTypeId /*typeId*/)
{
// TODO: Implement script-side battlegrounds.
/// @todo: Implement script-side battlegrounds.
ABORT();
return nullptr;
}