server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix : Warlock Soul Drain will not give a second Soul Shard if victim is under "Shadowburn" (#110)

Browse Source 
* Fix : Warlock Soul Drain will not give a second Soul Shard if victim is under "Shadowburn"

* Implement SPELL_EFFECT_TELEPORT_GRAVEYARD

Ported from CMangos
b05bb50b9e

* Fixes players not receiving Soul Shards when multiple players are using Drain Soul and/or Shadowburn

See d46bf1b4ca
This commit is contained in:
Elmsroth 2020-10-18 20:01:27 +02:00 committed by GitHub
parent 44ce5152d2
commit 695b5387e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/game/WorldHandlers/Spell.h
View File

@ -236,6 +236,7 @@ class Spell
void EffectPowerDrain(SpellEffectIndex eff_idx);
void EffectHeal(SpellEffectIndex eff_idx);
void EffectBind(SpellEffectIndex eff_idx);
void EffectTeleportGraveyard(SpellEffectIndex eff_idx);
void EffectHealthLeech(SpellEffectIndex eff_idx);
void EffectQuestComplete(SpellEffectIndex eff_idx);
void EffectCreateItem(SpellEffectIndex eff_idx);

25
src/game/WorldHandlers/SpellAuras.cpp
View File

@ -255,6 +255,10 @@ pAuraHandler AuraHandler[TOTAL_AURAS] =
static AuraType const frozenAuraTypes[] = { SPELL_AURA_MOD_ROOT, SPELL_AURA_MOD_STUN, SPELL_AURA_NONE };
enum SpellCreatedItems {
ITEM_SOUL_SHARD = 6265
};
Aura::Aura(SpellEntry const* spellproto, SpellEffectIndex eff, int32* currentBasePoints, SpellAuraHolder* holder, Unit* target, Unit* caster, Item* castItem) :
m_spellmod(NULL), m_periodicTimer(0), m_periodicTick(0), m_removeMode(AURA_REMOVE_BY_DEFAULT),
m_effIndex(eff), m_positive(false), m_isPeriodic(false), m_isAreaAura(false),
@ -2192,8 +2196,10 @@ void Aura::HandleChannelDeathItem(bool apply, bool Real)
return;
}
uint32 createdItemId = spellInfo->EffectItemType[m_effIndex];
// Soul Shard (target req.)
if (spellInfo->EffectItemType[m_effIndex] == 6265)
if (createdItemId == ITEM_SOUL_SHARD)
{
// Only from non-grey units
if (!((Player*)caster)->isHonorOrXPTarget(victim) ||
@ -2201,6 +2207,17 @@ void Aura::HandleChannelDeathItem(bool apply, bool Real)
{
return;
}
// Avoid awarding multiple souls on the same target
// 1.11.0: If you cast Drain Soul while shadowburn is on the victim, you will no longer receive two soul shards upon the victim's death.
for (auto const& aura : victim->GetAurasByType(SPELL_AURA_CHANNEL_DEATH_ITEM))
{
if (aura != this && caster->GetObjectGuid() == aura->GetCasterGuid() && aura->GetSpellProto()->EffectItemType[aura->GetEffIndex()] == ITEM_SOUL_SHARD)
{
return;
}
}
}
// Adding items
@ -2208,18 +2225,18 @@ void Aura::HandleChannelDeathItem(bool apply, bool Real)
uint32 count = m_modifier.m_amount;
ItemPosCountVec dest;
InventoryResult msg = ((Player*)caster)->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, spellInfo->EffectItemType[m_effIndex], count, &noSpaceForCount);
InventoryResult msg = ((Player*)caster)->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, createdItemId, count, &noSpaceForCount);
if (msg != EQUIP_ERR_OK)
{
count -= noSpaceForCount;
((Player*)caster)->SendEquipError(msg, NULL, NULL, spellInfo->EffectItemType[m_effIndex]);
((Player*)caster)->SendEquipError(msg, NULL, NULL, createdItemId);
if (count == 0)
{
return;
}
}
Item* newitem = ((Player*)caster)->StoreNewItem(dest, spellInfo->EffectItemType[m_effIndex], true);
Item* newitem = ((Player*)caster)->StoreNewItem(dest, createdItemId, true);
((Player*)caster)->SendNewItem(newitem, count, true, true);
}
}

11
src/game/WorldHandlers/SpellEffects.cpp
View File

@ -178,7 +178,7 @@ pEffect SpellEffects[TOTAL_SPELL_EFFECTS] =
&Spell::EffectSpiritHeal, // 117 SPELL_EFFECT_SPIRIT_HEAL one spell: Spirit Heal
&Spell::EffectSkill, // 118 SPELL_EFFECT_SKILL professions and more
&Spell::EffectApplyAreaAura, // 119 SPELL_EFFECT_APPLY_AREA_AURA_PET
&Spell::EffectUnused, // 120 SPELL_EFFECT_TELEPORT_GRAVEYARD one spell: Graveyard Teleport Test
&Spell::EffectTeleportGraveyard, // 120 SPELL_EFFECT_TELEPORT_GRAVEYARD one spell: Graveyard Teleport Test
&Spell::EffectWeaponDmg, // 121 SPELL_EFFECT_NORMALIZED_WEAPON_DMG
&Spell::EffectUnused, // 122 SPELL_EFFECT_122 unused
&Spell::EffectSendTaxi, // 123 SPELL_EFFECT_SEND_TAXI taxi/flight related (misc value is taxi path id)
@ -6163,3 +6163,12 @@ void Spell::EffectBind(SpellEffectIndex eff_idx)
data << uint32(area_id);
player->SendDirectMessage(&data);
}
void Spell::EffectTeleportGraveyard(SpellEffectIndex eff_idx)
{
if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER || !unitTarget->GetMap()->IsBattleGround())
return;
Player* player = static_cast<Player*>(unitTarget);
player->RepopAtGraveyard();
}