nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-23 13:46:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(Core/Script): Allow spell script ValidateSpellInfo to work with any container type (#6078)

Browse Source 
* Cherry-pick f2f0aeb562
Co-authored-by: Shauren <shauren.trinity@gmail.com>
This commit is contained in:
Kitzunu
2021-06-01 13:55:51 +02:00
committed by GitHub
parent 3919e9a474
commit b00ac48cfa
2 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/server/game/Spells/SpellScript.cpp
View File

@@ -14,26 +14,21 @@ bool _SpellScript::_Validate(SpellInfo const* entry)
{
if (!Validate(entry))
{
LOG_ERROR("server", "_SpellScript::_Validate: Spell `%u` did not pass Validate() function of script `%s` - script will not be added to the spell", entry->Id, m_scriptName->c_str());
LOG_ERROR("scripts.spells", "_SpellScript::_Validate: Spell `%u` did not pass Validate() function of script `%s` - script will not be added to the spell", entry->Id, m_scriptName->c_str());
return false;
}
return true;
}
bool _SpellScript::_ValidateSpellInfo(uint32 const* begin, uint32 const* end)
bool _SpellScript::_ValidateSpellInfo(uint32 spellId)
{
bool allValid = true;
while (begin != end)
if (!sSpellMgr->GetSpellInfo(spellId))
{
if (!sSpellMgr->GetSpellInfo(*begin))
{
LOG_ERROR("server", "_SpellScript::_ValidateSpellInfo: Spell %u does not exist.", *begin);
allValid = false;
}
++begin;
LOG_ERROR("scripts.spells", "_SpellScript::ValidateSpellInfo: Spell %u does not exist.", spellId);
return false;
}
return allValid;
return true;
}
void _SpellScript::_Register()