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

refactor(Core/Spells): Improved logic and DX Spell::EffectSummonPet (#2634)

Browse Source
This commit is contained in:
Yehonal
2020-02-20 07:55:04 +01:00
committed by GitHub
parent 32dcb3bf63
commit 0cabb8e7e1
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/SpellEffects.cpp
+10 -11
View File
@@ -3131,24 +3131,23 @@ void Spell::EffectSummonPet(SpellEffIndex effIndex)
if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT)
return; return;
Player* owner = NULL; if (!m_originalCaster)
if (m_originalCaster) return;
{
owner = m_originalCaster->ToPlayer();
if (!owner && m_originalCaster->ToCreature()->IsTotem())
owner = m_originalCaster->GetCharmerOrOwnerPlayerOrPlayerItself();
}
uint32 petentry = m_spellInfo->Effects[effIndex].MiscValue; uint32 petentry = m_spellInfo->Effects[effIndex].MiscValue;
int32 duration = m_spellInfo->GetDuration(); int32 duration = m_spellInfo->GetDuration();
if (m_originalCaster)
if(Player* modOwner = m_originalCaster->GetSpellModOwner()) if(Player* modOwner = m_originalCaster->GetSpellModOwner())
modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_DURATION, duration); modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_DURATION, duration);
Player* owner = m_originalCaster->ToPlayer();
if (!owner && m_originalCaster->ToCreature()->IsTotem())
owner = m_originalCaster->GetCharmerOrOwnerPlayerOrPlayerItself();
if (!owner) if (!owner)
{ {
SummonPropertiesEntry const* properties = sSummonPropertiesStore.LookupEntry(67); SummonPropertiesEntry const* properties = sSummonPropertiesStore.LookupEntry(67);
if (properties && m_originalCaster) if (properties)
{ {
// Xinef: unsummon old guardian // Xinef: unsummon old guardian
if (Guardian* oldPet = m_originalCaster->GetGuardianPet()) if (Guardian* oldPet = m_originalCaster->GetGuardianPet())