Skip to content

Commit 86bfc4c

Browse files
Merge AzerothCore 3.3.5 to ElunaAzerothcore [skip ci]
2 parents 7ff2834 + f8c5c9a commit 86bfc4c

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

src/server/game/Entities/Unit/Unit.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6771,7 +6771,7 @@ void Unit::ProcSkillsAndAuras(Unit* actor, Unit* victim, uint32 procAttacker, ui
67716771
}
67726772
else if (healInfo && healInfo->GetHeal())
67736773
spellTypeMask = PROC_SPELL_TYPE_HEAL;
6774-
else if (damageInfo && damageInfo->GetDamage())
6774+
else if (damageInfo && (damageInfo->GetDamage() || damageInfo->GetAbsorb()))
67756775
spellTypeMask = PROC_SPELL_TYPE_DAMAGE;
67766776
else if (procSpellInfo)
67776777
spellTypeMask = PROC_SPELL_TYPE_NO_DMG_HEAL;

src/server/game/Spells/SpellEffects.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2471,6 +2471,11 @@ void Spell::EffectSummonType(SpellEffIndex effIndex)
24712471

24722472
TempSummonType summonType = (duration <= 0) ? TEMPSUMMON_DEAD_DESPAWN : TEMPSUMMON_TIMED_DESPAWN;
24732473

2474+
Unit* summoner = m_originalCaster;
2475+
if (summoner->IsPet())
2476+
if (Unit* owner = summoner->GetOwner())
2477+
summoner = owner;
2478+
24742479
for (uint32 count = 0; count < numSummons; ++count)
24752480
{
24762481
Position pos;
@@ -2480,7 +2485,7 @@ void Spell::EffectSummonType(SpellEffIndex effIndex)
24802485
// randomize position for multiple summons
24812486
pos = m_caster->GetRandomPoint(*destTarget, radius);
24822487

2483-
summon = m_originalCaster->SummonCreature(entry, pos, summonType, duration, 0, nullptr, personalSpawn);
2488+
summon = summoner->SummonCreature(entry, pos, summonType, duration, 0, nullptr, personalSpawn);
24842489
if (!summon)
24852490
continue;
24862491

0 commit comments

Comments
 (0)