nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-18 19:35:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(Core/Common): delete old Tokenizer (#10121)

Browse Source
This commit is contained in:
Kargatum
2022-01-21 14:59:05 +07:00
committed by GitHub
parent a25ef74de3
commit 6d7f58e6ed
24 changed files with 284 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/server/game/Globals/ObjectMgr.cpp
View File

@@ -47,6 +47,8 @@
#include "Vehicle.h"
#include "WaypointMgr.h"
#include "World.h"
#include "StringConvert.h"
#include "Tokenize.h"
ScriptMapMap sSpellScripts;
ScriptMapMap sEventScripts;
@@ -778,25 +780,34 @@ void ObjectMgr::LoadCreatureTemplateAddons()
creatureAddon.emote = fields[5].GetUInt32();
creatureAddon.visibilityDistanceType = VisibilityDistanceType(fields[6].GetUInt8());
Tokenizer tokens(fields[7].GetString(), ' ');
creatureAddon.auras.reserve(tokens.size());
for (Tokenizer::const_iterator itr = tokens.begin(); itr != tokens.end(); ++itr)
for (std::string_view aura : Acore::Tokenize(fields[7].GetStringView(), ' ', false))
{
SpellInfo const* AdditionalSpellInfo = sSpellMgr->GetSpellInfo(uint32(atol(*itr)));
if (!AdditionalSpellInfo)
SpellInfo const* spellInfo = nullptr;
if (Optional<uint32> spellId = Acore::StringTo<uint32>(aura))
{
LOG_ERROR("sql.sql", "Creature (Entry: %u) has wrong spell %u defined in `auras` field in `creature_template_addon`.", entry, uint32(atol(*itr)));
spellInfo = sSpellMgr->GetSpellInfo(*spellId);
}
if (!spellInfo)
{
FMT_LOG_ERROR("sql.sql", "Creature (Entry: {}) has wrong spell '{}' defined in `auras` field in `creature_template_addon`.", entry, aura);
continue;
}
if (AdditionalSpellInfo->GetDuration() > 0)
if (std::find(creatureAddon.auras.begin(), creatureAddon.auras.end(), spellInfo->Id) != creatureAddon.auras.end())
{
LOG_DEBUG/*ERROR*/("sql.sql", "Creature (Entry: %u) has temporary aura (spell %u) in `auras` field in `creature_template_addon`.", entry, uint32(atol(*itr)));
FMT_LOG_ERROR("sql.sql", "Creature (Entry: %u) has duplicate aura (spell %u) in `auras` field in `creature_template_addon`.", entry, spellInfo->Id);
continue;
}
if (spellInfo->GetDuration() > 0)
{
LOG_DEBUG/*ERROR*/("sql.sql", "Creature (Entry: %u) has temporary aura (spell %u) in `auras` field in `creature_template_addon`.", entry, spellInfo->Id);
// continue;
}
creatureAddon.auras.push_back(atol(*itr));
creatureAddon.auras.push_back(spellInfo->Id);
}
if (creatureAddon.mount)
@@ -1247,25 +1258,34 @@ void ObjectMgr::LoadCreatureAddons()
creatureAddon.emote = fields[5].GetUInt32();
creatureAddon.visibilityDistanceType = VisibilityDistanceType(fields[6].GetUInt8());
Tokenizer tokens(fields[7].GetString(), ' ');
creatureAddon.auras.reserve(tokens.size());
for (Tokenizer::const_iterator itr = tokens.begin(); itr != tokens.end(); ++itr)
for (std::string_view aura : Acore::Tokenize(fields[7].GetStringView(), ' ', false))
{
SpellInfo const* AdditionalSpellInfo = sSpellMgr->GetSpellInfo(uint32(atol(*itr)));
if (!AdditionalSpellInfo)
SpellInfo const* spellInfo = nullptr;
if (Optional<uint32> spellId = Acore::StringTo<uint32>(aura))
{
LOG_ERROR("sql.sql", "Creature (GUID: %u) has wrong spell %u defined in `auras` field in `creature_addon`.", guid, uint32(atol(*itr)));
spellInfo = sSpellMgr->GetSpellInfo(*spellId);
}
if (!spellInfo)
{
FMT_LOG_ERROR("sql.sql", "Creature (GUID: {}) has wrong spell '{}' defined in `auras` field in `creature_addon`.", guid, aura);
continue;
}
if (AdditionalSpellInfo->GetDuration() > 0)
if (std::find(creatureAddon.auras.begin(), creatureAddon.auras.end(), spellInfo->Id) != creatureAddon.auras.end())
{
LOG_DEBUG/*ERROR*/("sql.sql", "Creature (Entry: %u) has temporary aura (spell %u) in `auras` field in `creature_template_addon`.", guid, uint32(atol(*itr)));
FMT_LOG_ERROR("sql.sql", "Creature (GUID: {}) has duplicate aura (spell {}) in `auras` field in `creature_addon`.", guid, spellInfo->Id);
continue;
}
if (spellInfo->GetDuration() > 0)
{
LOG_DEBUG/*ERROR*/("sql.sql", "Creature (Entry: %u) has temporary aura (spell %u) in `auras` field in `creature_template_addon`.", guid, spellInfo->Id);
// continue;
}
creatureAddon.auras.push_back(atol(*itr));
creatureAddon.auras.push_back(spellInfo->Id);
}
if (creatureAddon.mount)