mirror of
https://github.com/mangosfour/server.git
synced 2025-12-21 19:37:02 +00:00
Merge commit 'origin/master' into 320
Conflicts: src/game/MovementHandler.cpp src/game/Player.cpp
This commit is contained in:
tomrus88
commit
f07363e9e0
218 changed files with 708 additions and 860 deletions
|
|
@ -366,7 +366,7 @@ m_spellmod(NULL), m_caster_guid(0), m_target(target), m_castItemGuid(castItem?ca
|
|||
m_timeCla(1000), m_periodicTimer(0), m_removeMode(AURA_REMOVE_BY_DEFAULT), m_AuraDRGroup(DIMINISHING_NONE),
|
||||
m_effIndex(eff), m_auraSlot(MAX_AURAS), m_auraFlags(AFLAG_NONE), m_auraLevel(1), m_procCharges(0), m_stackAmount(1),
|
||||
m_positive(false), m_permanent(false), m_isPeriodic(false), m_isAreaAura(false), m_isPersistent(false),
|
||||
m_isRemovedOnShapeLost(true), m_updated(false), m_in_use(false)
|
||||
m_isRemovedOnShapeLost(true), m_in_use(0), m_deleted(false)
|
||||
{
|
||||
assert(target);
|
||||
|
||||
|
|
@ -801,12 +801,8 @@ void AreaAura::Update(uint32 diff)
|
|||
}
|
||||
else // aura at non-caster
|
||||
{
|
||||
Unit * tmp_target = m_target;
|
||||
Unit* caster = GetCaster();
|
||||
uint32 tmp_spellId = GetId(), tmp_effIndex = m_effIndex;
|
||||
|
||||
// WARNING: the aura may get deleted during the update
|
||||
// DO NOT access its members after update!
|
||||
Aura::Update(diff);
|
||||
|
||||
// remove aura if out-of-range from caster (after teleport for example)
|
||||
|
|
@ -814,53 +810,53 @@ void AreaAura::Update(uint32 diff)
|
|||
// or caster is (no longer) friendly
|
||||
bool needFriendly = (m_areaAuraType == AREA_AURA_ENEMY ? false : true);
|
||||
if( !caster || caster->hasUnitState(UNIT_STAT_ISOLATED) ||
|
||||
!caster->IsWithinDistInMap(tmp_target, m_radius) ||
|
||||
!caster->HasAura(tmp_spellId, tmp_effIndex) ||
|
||||
caster->IsFriendlyTo(tmp_target) != needFriendly
|
||||
!caster->IsWithinDistInMap(m_target, m_radius) ||
|
||||
!caster->HasAura(GetId(), GetEffIndex()) ||
|
||||
caster->IsFriendlyTo(m_target) != needFriendly
|
||||
)
|
||||
{
|
||||
tmp_target->RemoveAura(tmp_spellId, tmp_effIndex);
|
||||
m_target->RemoveAura(GetId(), GetEffIndex());
|
||||
}
|
||||
else if( m_areaAuraType == AREA_AURA_PARTY) // check if in same sub group
|
||||
{
|
||||
// not check group if target == owner or target == pet
|
||||
if (caster->GetCharmerOrOwnerGUID() != tmp_target->GetGUID() && caster->GetGUID() != tmp_target->GetCharmerOrOwnerGUID())
|
||||
if (caster->GetCharmerOrOwnerGUID() != m_target->GetGUID() && caster->GetGUID() != m_target->GetCharmerOrOwnerGUID())
|
||||
{
|
||||
Player* check = caster->GetCharmerOrOwnerPlayerOrPlayerItself();
|
||||
|
||||
Group *pGroup = check ? check->GetGroup() : NULL;
|
||||
if( pGroup )
|
||||
{
|
||||
Player* checkTarget = tmp_target->GetCharmerOrOwnerPlayerOrPlayerItself();
|
||||
Player* checkTarget = m_target->GetCharmerOrOwnerPlayerOrPlayerItself();
|
||||
if(!checkTarget || !pGroup->SameSubGroup(check, checkTarget))
|
||||
tmp_target->RemoveAura(tmp_spellId, tmp_effIndex);
|
||||
m_target->RemoveAura(GetId(), GetEffIndex());
|
||||
}
|
||||
else
|
||||
tmp_target->RemoveAura(tmp_spellId, tmp_effIndex);
|
||||
m_target->RemoveAura(GetId(), GetEffIndex());
|
||||
}
|
||||
}
|
||||
else if( m_areaAuraType == AREA_AURA_RAID) // TODO: fix me!
|
||||
{
|
||||
// not check group if target == owner or target == pet
|
||||
if (caster->GetCharmerOrOwnerGUID() != tmp_target->GetGUID() && caster->GetGUID() != tmp_target->GetCharmerOrOwnerGUID())
|
||||
if (caster->GetCharmerOrOwnerGUID() != m_target->GetGUID() && caster->GetGUID() != m_target->GetCharmerOrOwnerGUID())
|
||||
{
|
||||
Player* check = caster->GetCharmerOrOwnerPlayerOrPlayerItself();
|
||||
|
||||
Group *pGroup = check ? check->GetGroup() : NULL;
|
||||
if( pGroup )
|
||||
{
|
||||
Player* checkTarget = tmp_target->GetCharmerOrOwnerPlayerOrPlayerItself();
|
||||
Player* checkTarget = m_target->GetCharmerOrOwnerPlayerOrPlayerItself();
|
||||
if(!checkTarget)
|
||||
tmp_target->RemoveAura(tmp_spellId, tmp_effIndex);
|
||||
m_target->RemoveAura(GetId(), GetEffIndex());
|
||||
}
|
||||
else
|
||||
tmp_target->RemoveAura(tmp_spellId, tmp_effIndex);
|
||||
m_target->RemoveAura(GetId(), GetEffIndex());
|
||||
}
|
||||
}
|
||||
else if( m_areaAuraType == AREA_AURA_PET || m_areaAuraType == AREA_AURA_OWNER )
|
||||
{
|
||||
if( tmp_target->GetGUID() != caster->GetCharmerOrOwnerGUID() )
|
||||
tmp_target->RemoveAura(tmp_spellId, tmp_effIndex);
|
||||
if( m_target->GetGUID() != caster->GetCharmerOrOwnerGUID() )
|
||||
m_target->RemoveAura(GetId(), GetEffIndex());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -871,8 +867,7 @@ void PersistentAreaAura::Update(uint32 diff)
|
|||
|
||||
// remove the aura if its caster or the dynamic object causing it was removed
|
||||
// or if the target moves too far from the dynamic object
|
||||
Unit *caster = GetCaster();
|
||||
if (caster)
|
||||
if(Unit *caster = GetCaster())
|
||||
{
|
||||
DynamicObject *dynObj = caster->GetDynObject(GetId(), GetEffIndex());
|
||||
if (dynObj)
|
||||
|
|
@ -886,25 +881,20 @@ void PersistentAreaAura::Update(uint32 diff)
|
|||
else
|
||||
remove = true;
|
||||
|
||||
Unit *tmp_target = m_target;
|
||||
uint32 tmp_id = GetId(), tmp_index = GetEffIndex();
|
||||
|
||||
// WARNING: the aura may get deleted during the update
|
||||
// DO NOT access its members after update!
|
||||
Aura::Update(diff);
|
||||
|
||||
if(remove)
|
||||
tmp_target->RemoveAura(tmp_id, tmp_index);
|
||||
m_target->RemoveAura(GetId(), GetEffIndex());
|
||||
}
|
||||
|
||||
void Aura::ApplyModifier(bool apply, bool Real)
|
||||
{
|
||||
AuraType aura = m_modifier.m_auraname;
|
||||
|
||||
m_in_use = true;
|
||||
SetInUse(true);
|
||||
if(aura < TOTAL_AURAS)
|
||||
(*this.*AuraHandler [aura])(apply, Real);
|
||||
m_in_use = false;
|
||||
SetInUse(false);
|
||||
}
|
||||
|
||||
void Aura::_AddAura()
|
||||
|
|
@ -3609,47 +3599,44 @@ void Aura::HandleAuraModStun(bool apply, bool Real)
|
|||
|
||||
void Aura::HandleModStealth(bool apply, bool Real)
|
||||
{
|
||||
Unit* pTarget = m_target;
|
||||
SpellEntry const* pSpellInfo = GetSpellProto();
|
||||
|
||||
if (apply)
|
||||
{
|
||||
// drop flag at stealth in bg
|
||||
pTarget->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_IMMUNE_OR_LOST_SELECTION);
|
||||
m_target->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_IMMUNE_OR_LOST_SELECTION);
|
||||
|
||||
// only at real aura add
|
||||
if (Real)
|
||||
{
|
||||
pTarget->SetStandFlags(UNIT_STAND_FLAGS_CREEP);
|
||||
m_target->SetStandFlags(UNIT_STAND_FLAGS_CREEP);
|
||||
|
||||
if (pTarget->GetTypeId()==TYPEID_PLAYER)
|
||||
pTarget->SetFlag(PLAYER_FIELD_BYTES2, 0x2000);
|
||||
if (m_target->GetTypeId()==TYPEID_PLAYER)
|
||||
m_target->SetFlag(PLAYER_FIELD_BYTES2, 0x2000);
|
||||
|
||||
// apply only if not in GM invisibility (and overwrite invisibility state)
|
||||
if (pTarget->GetVisibility()!=VISIBILITY_OFF)
|
||||
if (m_target->GetVisibility()!=VISIBILITY_OFF)
|
||||
{
|
||||
pTarget->SetVisibility(VISIBILITY_GROUP_NO_DETECT);
|
||||
pTarget->SetVisibility(VISIBILITY_GROUP_STEALTH);
|
||||
m_target->SetVisibility(VISIBILITY_GROUP_NO_DETECT);
|
||||
m_target->SetVisibility(VISIBILITY_GROUP_STEALTH);
|
||||
}
|
||||
|
||||
// apply full stealth period bonuses only at first stealth aura in stack
|
||||
if(pTarget->GetAurasByType(SPELL_AURA_MOD_STEALTH).size()<=1)
|
||||
if(m_target->GetAurasByType(SPELL_AURA_MOD_STEALTH).size()<=1)
|
||||
{
|
||||
Unit::AuraList const& mDummyAuras = pTarget->GetAurasByType(SPELL_AURA_DUMMY);
|
||||
Unit::AuraList const& mDummyAuras = m_target->GetAurasByType(SPELL_AURA_DUMMY);
|
||||
for(Unit::AuraList::const_iterator i = mDummyAuras.begin();i != mDummyAuras.end(); ++i)
|
||||
{
|
||||
// Master of Subtlety
|
||||
if ((*i)->GetSpellProto()->SpellIconID == 2114)
|
||||
{
|
||||
pTarget->RemoveAurasDueToSpell(31666);
|
||||
m_target->RemoveAurasDueToSpell(31666);
|
||||
int32 bp = (*i)->GetModifier()->m_amount;
|
||||
pTarget->CastCustomSpell(pTarget,31665,&bp,NULL,NULL,true);
|
||||
m_target->CastCustomSpell(m_target,31665,&bp,NULL,NULL,true);
|
||||
}
|
||||
// Overkill
|
||||
else if ((*i)->GetId() == 58426 && pSpellInfo->SpellFamilyFlags & UI64LIT(0x0000000000400000))
|
||||
else if ((*i)->GetId() == 58426 && GetSpellProto()->SpellFamilyFlags & UI64LIT(0x0000000000400000))
|
||||
{
|
||||
pTarget->RemoveAurasDueToSpell(58428);
|
||||
pTarget->CastSpell(pTarget, 58427, true);
|
||||
m_target->RemoveAurasDueToSpell(58428);
|
||||
m_target->CastSpell(m_target, 58427, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -3658,36 +3645,36 @@ void Aura::HandleModStealth(bool apply, bool Real)
|
|||
else
|
||||
{
|
||||
// only at real aura remove of _last_ SPELL_AURA_MOD_STEALTH
|
||||
if (Real && !pTarget->HasAuraType(SPELL_AURA_MOD_STEALTH))
|
||||
if (Real && !m_target->HasAuraType(SPELL_AURA_MOD_STEALTH))
|
||||
{
|
||||
// if no GM invisibility
|
||||
if(pTarget->GetVisibility()!=VISIBILITY_OFF)
|
||||
if (m_target->GetVisibility()!=VISIBILITY_OFF)
|
||||
{
|
||||
pTarget->RemoveStandFlags(UNIT_STAND_FLAGS_CREEP);
|
||||
m_target->RemoveStandFlags(UNIT_STAND_FLAGS_CREEP);
|
||||
|
||||
if (pTarget->GetTypeId()==TYPEID_PLAYER)
|
||||
pTarget->RemoveFlag(PLAYER_FIELD_BYTES2, 0x2000);
|
||||
if (m_target->GetTypeId()==TYPEID_PLAYER)
|
||||
m_target->RemoveFlag(PLAYER_FIELD_BYTES2, 0x2000);
|
||||
|
||||
// restore invisibility if any
|
||||
if (pTarget->HasAuraType(SPELL_AURA_MOD_INVISIBILITY))
|
||||
if (m_target->HasAuraType(SPELL_AURA_MOD_INVISIBILITY))
|
||||
{
|
||||
pTarget->SetVisibility(VISIBILITY_GROUP_NO_DETECT);
|
||||
pTarget->SetVisibility(VISIBILITY_GROUP_INVISIBILITY);
|
||||
m_target->SetVisibility(VISIBILITY_GROUP_NO_DETECT);
|
||||
m_target->SetVisibility(VISIBILITY_GROUP_INVISIBILITY);
|
||||
}
|
||||
else
|
||||
pTarget->SetVisibility(VISIBILITY_ON);
|
||||
m_target->SetVisibility(VISIBILITY_ON);
|
||||
}
|
||||
|
||||
// apply delayed talent bonus remover at last stealth aura remove
|
||||
Unit::AuraList const& mDummyAuras = pTarget->GetAurasByType(SPELL_AURA_DUMMY);
|
||||
Unit::AuraList const& mDummyAuras = m_target->GetAurasByType(SPELL_AURA_DUMMY);
|
||||
for(Unit::AuraList::const_iterator i = mDummyAuras.begin();i != mDummyAuras.end(); ++i)
|
||||
{
|
||||
// Master of Subtlety
|
||||
if ((*i)->GetSpellProto()->SpellIconID == 2114)
|
||||
pTarget->CastSpell(pTarget, 31666, true);
|
||||
m_target->CastSpell(m_target, 31666, true);
|
||||
// Overkill
|
||||
else if ((*i)->GetId() == 58426 && pSpellInfo->SpellFamilyFlags & UI64LIT(0x0000000000400000))
|
||||
pTarget->CastSpell(pTarget, 58428, true);
|
||||
else if ((*i)->GetId() == 58426 && GetSpellProto()->SpellFamilyFlags & UI64LIT(0x0000000000400000))
|
||||
m_target->CastSpell(m_target, 58428, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -4048,38 +4035,34 @@ void Aura::HandleAuraModUseNormalSpeed(bool /*apply*/, bool Real)
|
|||
|
||||
void Aura::HandleModMechanicImmunity(bool apply, bool /*Real*/)
|
||||
{
|
||||
// cache values in local vars for prevent access to possible deleted aura data
|
||||
SpellEntry const* spellInfo = GetSpellProto();
|
||||
uint32 misc = m_modifier.m_miscvalue;
|
||||
Unit* target = m_target;
|
||||
|
||||
// Forbearance
|
||||
// in DBC wrong mechanic immune since 3.0.x
|
||||
if (GetId() == 25771)
|
||||
misc = MECHANIC_IMMUNE_SHIELD;
|
||||
|
||||
|
||||
if(apply && spellInfo->AttributesEx & SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY)
|
||||
if(apply && GetSpellProto()->AttributesEx & SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY)
|
||||
{
|
||||
uint32 mechanic = 1 << m_modifier.m_miscvalue;
|
||||
uint32 mechanic = 1 << misc;
|
||||
|
||||
//immune movement impairment and loss of control
|
||||
if(GetId()==42292 || GetId()==59752)
|
||||
mechanic=IMMUNE_TO_MOVEMENT_IMPAIRMENT_AND_LOSS_CONTROL_MASK;
|
||||
|
||||
Unit::AuraMap& Auras = target->GetAuras();
|
||||
Unit::AuraMap& Auras = m_target->GetAuras();
|
||||
for(Unit::AuraMap::iterator iter = Auras.begin(), next; iter != Auras.end(); iter = next)
|
||||
{
|
||||
next = iter;
|
||||
++next;
|
||||
SpellEntry const *spell = iter->second->GetSpellProto();
|
||||
if (!( spell->Attributes & SPELL_ATTR_UNAFFECTED_BY_INVULNERABILITY) && // spells unaffected by invulnerability
|
||||
spell->Id != spellInfo->Id)
|
||||
spell->Id != GetId())
|
||||
{
|
||||
//check for mechanic mask
|
||||
if(GetSpellMechanicMask(spell, iter->second->GetEffIndex()) & mechanic)
|
||||
{
|
||||
target->RemoveAurasDueToSpell(spell->Id);
|
||||
m_target->RemoveAurasDueToSpell(spell->Id);
|
||||
if(Auras.empty())
|
||||
break;
|
||||
else
|
||||
|
|
@ -4089,13 +4072,13 @@ void Aura::HandleModMechanicImmunity(bool apply, bool /*Real*/)
|
|||
}
|
||||
}
|
||||
|
||||
target->ApplySpellImmune(spellInfo->Id,IMMUNITY_MECHANIC,misc,apply);
|
||||
m_target->ApplySpellImmune(GetId(),IMMUNITY_MECHANIC,misc,apply);
|
||||
|
||||
// Bestial Wrath
|
||||
if (spellInfo->SpellFamilyName == SPELLFAMILY_HUNTER && spellInfo->SpellIconID == 1680)
|
||||
if (GetSpellProto()->SpellFamilyName == SPELLFAMILY_HUNTER && GetSpellProto()->SpellIconID == 1680)
|
||||
{
|
||||
// The Beast Within cast on owner if talent present
|
||||
if (Unit* owner = target->GetOwner())
|
||||
if (Unit* owner = m_target->GetOwner())
|
||||
{
|
||||
// Search talent
|
||||
Unit::AuraList const& dummyAuras = owner->GetAurasByType(SPELL_AURA_DUMMY);
|
||||
|
|
@ -4112,25 +4095,6 @@ void Aura::HandleModMechanicImmunity(bool apply, bool /*Real*/)
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
// The Beast Within and Bestial Wrath - immunity
|
||||
if (spellInfo->Id == 19574 || spellInfo->Id == 34471)
|
||||
{
|
||||
if (apply)
|
||||
{
|
||||
target->CastSpell(target, 24395, true);
|
||||
target->CastSpell(target, 24396, true);
|
||||
target->CastSpell(target, 24397, true);
|
||||
target->CastSpell(target, 26592, true);
|
||||
}
|
||||
else
|
||||
{
|
||||
target->RemoveAurasDueToSpell(24395);
|
||||
target->RemoveAurasDueToSpell(24396);
|
||||
target->RemoveAurasDueToSpell(24397);
|
||||
target->RemoveAurasDueToSpell(26592);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//this method is called whenever we add / remove aura which gives m_target some imunity to some spell effect
|
||||
|
|
@ -5565,6 +5529,7 @@ void Aura::HandleSpellSpecificBoosts(bool apply)
|
|||
uint32 spellId1 = 0;
|
||||
uint32 spellId2 = 0;
|
||||
uint32 spellId3 = 0;
|
||||
uint32 spellId4 = 0;
|
||||
|
||||
switch(GetSpellProto()->SpellFamilyName)
|
||||
{
|
||||
|
|
@ -5591,15 +5556,19 @@ void Aura::HandleSpellSpecificBoosts(bool apply)
|
|||
}
|
||||
case SPELLFAMILY_HUNTER:
|
||||
{
|
||||
if(GetSpellSpecific(m_spellProto->Id) != SPELL_ASPECT)
|
||||
return;
|
||||
|
||||
// The Beast Within and Bestial Wrath - immunity
|
||||
if (GetId() == 19574 || GetId() == 34471)
|
||||
{
|
||||
spellId1 = 24395;
|
||||
spellId2 = 24396;
|
||||
spellId3 = 24397;
|
||||
spellId4 = 26592;
|
||||
}
|
||||
// Aspect of the Dragonhawk dodge
|
||||
if (GetSpellProto()->SpellFamilyFlags2 & 0x00001000)
|
||||
else if(GetSpellProto()->SpellFamilyFlags2 & 0x00001000)
|
||||
spellId1 = 61848;
|
||||
else
|
||||
return;
|
||||
|
||||
break;
|
||||
}
|
||||
case SPELLFAMILY_PALADIN:
|
||||
|
|
@ -5649,6 +5618,8 @@ void Aura::HandleSpellSpecificBoosts(bool apply)
|
|||
m_target->CastSpell(m_target, spellId2, true, NULL, this);
|
||||
if (spellId3)
|
||||
m_target->CastSpell(m_target, spellId3, true, NULL, this);
|
||||
if (spellId4)
|
||||
m_target->CastSpell(m_target, spellId4, true, NULL, this);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -5658,6 +5629,8 @@ void Aura::HandleSpellSpecificBoosts(bool apply)
|
|||
m_target->RemoveAurasByCasterSpell(spellId2, GetCasterGUID());
|
||||
if (spellId3)
|
||||
m_target->RemoveAurasByCasterSpell(spellId3, GetCasterGUID());
|
||||
if (spellId4)
|
||||
m_target->RemoveAurasByCasterSpell(spellId4, GetCasterGUID());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -5892,32 +5865,26 @@ void Aura::HandleSchoolAbsorb(bool apply, bool Real)
|
|||
switch(m_spellProto->SpellFamilyName)
|
||||
{
|
||||
case SPELLFAMILY_PRIEST:
|
||||
if(m_spellProto->SpellFamilyFlags == 0x1) //PW:S
|
||||
{
|
||||
//+30% from +healing bonus
|
||||
DoneActualBenefit = caster->SpellBaseHealingBonus(GetSpellSchoolMask(m_spellProto)) * 0.3f;
|
||||
break;
|
||||
}
|
||||
// Power Word: Shield
|
||||
if (m_spellProto->SpellFamilyFlags & UI64LIT(0x0000000000000001))
|
||||
//+80.68% from +spell bonus
|
||||
DoneActualBenefit = caster->SpellBaseHealingBonus(GetSpellSchoolMask(m_spellProto)) * 0.8068f;
|
||||
break;
|
||||
case SPELLFAMILY_MAGE:
|
||||
if (m_spellProto->SpellFamilyFlags == UI64LIT(0x80100) ||
|
||||
m_spellProto->SpellFamilyFlags == UI64LIT(0x8) ||
|
||||
m_spellProto->SpellFamilyFlags == UI64LIT(0x100000000))
|
||||
{
|
||||
//frost ward, fire ward, ice barrier
|
||||
//+10% from +spd bonus
|
||||
// Frost Ward, Fire Ward
|
||||
if (m_spellProto->SpellFamilyFlags & UI64LIT(0x0000000000000108))
|
||||
//+10% from +spell bonus
|
||||
DoneActualBenefit = caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.1f;
|
||||
break;
|
||||
}
|
||||
// Ice Barrier
|
||||
else if (m_spellProto->SpellFamilyFlags & UI64LIT(0x0000000100000000))
|
||||
//+80.67% from +spell bonus
|
||||
DoneActualBenefit = caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.8067f;
|
||||
break;
|
||||
case SPELLFAMILY_WARLOCK:
|
||||
if(m_spellProto->SpellFamilyFlags == 0x00)
|
||||
{
|
||||
//shadow ward
|
||||
//+10% from +spd bonus
|
||||
DoneActualBenefit = caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.1f;
|
||||
break;
|
||||
}
|
||||
// Shadow Ward
|
||||
if (m_spellProto->SpellFamilyFlags2 & 0x00000040)
|
||||
//+30% from +spell bonus
|
||||
DoneActualBenefit = caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.30f;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
|
@ -6121,18 +6088,15 @@ void Aura::PeriodicTick()
|
|||
SpellPeriodicAuraLogInfo pInfo(this, pdamage, 0, absorb, resist, 0.0f, isCrit);
|
||||
m_target->SendPeriodicAuraLog(&pInfo);
|
||||
|
||||
Unit* target = m_target; // aura can be deleted in DealDamage
|
||||
SpellEntry const* spellProto = GetSpellProto();
|
||||
|
||||
// Set trigger flag
|
||||
uint32 procAttacker = PROC_FLAG_ON_DO_PERIODIC; // | PROC_FLAG_SUCCESSFUL_HARMFUL_SPELL_HIT;
|
||||
uint32 procVictim = PROC_FLAG_ON_TAKE_PERIODIC;// | PROC_FLAG_TAKEN_HARMFUL_SPELL_HIT;
|
||||
pdamage = (pdamage <= absorb + resist) ? 0 : (pdamage - absorb - resist);
|
||||
if (pdamage)
|
||||
procVictim|=PROC_FLAG_TAKEN_ANY_DAMAGE;
|
||||
pCaster->ProcDamageAndSpell(target, procAttacker, procVictim, PROC_EX_NORMAL_HIT, pdamage, BASE_ATTACK, spellProto);
|
||||
pCaster->ProcDamageAndSpell(m_target, procAttacker, procVictim, PROC_EX_NORMAL_HIT, pdamage, BASE_ATTACK, GetSpellProto());
|
||||
|
||||
pCaster->DealDamage(target, pdamage, &cleanDamage, DOT, GetSpellSchoolMask(spellProto), spellProto, true);
|
||||
pCaster->DealDamage(m_target, pdamage, &cleanDamage, DOT, GetSpellSchoolMask(GetSpellProto()), GetSpellProto(), true);
|
||||
break;
|
||||
}
|
||||
case SPELL_AURA_PERIODIC_LEECH:
|
||||
|
|
@ -6184,10 +6148,7 @@ void Aura::PeriodicTick()
|
|||
|
||||
pCaster->SendSpellNonMeleeDamageLog(m_target, GetId(), pdamage, GetSpellSchoolMask(GetSpellProto()), absorb, resist, false, 0);
|
||||
|
||||
Unit* target = m_target; // aura can be deleted in DealDamage
|
||||
SpellEntry const* spellProto = GetSpellProto();
|
||||
float multiplier = spellProto->EffectMultipleValue[GetEffIndex()] > 0 ? spellProto->EffectMultipleValue[GetEffIndex()] : 1;
|
||||
int32 stackAmount = GetStackAmount();
|
||||
float multiplier = GetSpellProto()->EffectMultipleValue[GetEffIndex()] > 0 ? GetSpellProto()->EffectMultipleValue[GetEffIndex()] : 1;
|
||||
|
||||
// Set trigger flag
|
||||
uint32 procAttacker = PROC_FLAG_ON_DO_PERIODIC; // | PROC_FLAG_SUCCESSFUL_HARMFUL_SPELL_HIT;
|
||||
|
|
@ -6195,26 +6156,26 @@ void Aura::PeriodicTick()
|
|||
pdamage = (pdamage <= absorb + resist) ? 0 : (pdamage-absorb-resist);
|
||||
if (pdamage)
|
||||
procVictim|=PROC_FLAG_TAKEN_ANY_DAMAGE;
|
||||
pCaster->ProcDamageAndSpell(target, procAttacker, procVictim, PROC_EX_NORMAL_HIT, pdamage, BASE_ATTACK, spellProto);
|
||||
int32 new_damage = pCaster->DealDamage(target, pdamage, &cleanDamage, DOT, GetSpellSchoolMask(spellProto), spellProto, false);
|
||||
pCaster->ProcDamageAndSpell(m_target, procAttacker, procVictim, PROC_EX_NORMAL_HIT, pdamage, BASE_ATTACK, GetSpellProto());
|
||||
int32 new_damage = pCaster->DealDamage(m_target, pdamage, &cleanDamage, DOT, GetSpellSchoolMask(GetSpellProto()), GetSpellProto(), false);
|
||||
|
||||
if (!target->isAlive() && pCaster->IsNonMeleeSpellCasted(false))
|
||||
if (!m_target->isAlive() && pCaster->IsNonMeleeSpellCasted(false))
|
||||
{
|
||||
for (uint32 i = CURRENT_FIRST_NON_MELEE_SPELL; i < CURRENT_MAX_SPELL; ++i)
|
||||
{
|
||||
if (pCaster->m_currentSpells[i] && pCaster->m_currentSpells[i]->m_spellInfo->Id == spellProto->Id)
|
||||
if (pCaster->m_currentSpells[i] && pCaster->m_currentSpells[i]->m_spellInfo->Id == GetId())
|
||||
pCaster->m_currentSpells[i]->cancel();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if(Player *modOwner = pCaster->GetSpellModOwner())
|
||||
modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_MULTIPLE_VALUE, multiplier);
|
||||
modOwner->ApplySpellMod(GetId(), SPELLMOD_MULTIPLE_VALUE, multiplier);
|
||||
|
||||
uint32 heal = pCaster->SpellHealingBonus(pCaster, spellProto, uint32(new_damage * multiplier), DOT, stackAmount);
|
||||
uint32 heal = pCaster->SpellHealingBonus(pCaster, GetSpellProto(), uint32(new_damage * multiplier), DOT, GetStackAmount());
|
||||
|
||||
int32 gain = pCaster->DealHeal(pCaster, heal, spellProto);
|
||||
pCaster->getHostilRefManager().threatAssist(pCaster, gain * 0.5f, spellProto);
|
||||
int32 gain = pCaster->DealHeal(pCaster, heal, GetSpellProto());
|
||||
pCaster->getHostilRefManager().threatAssist(pCaster, gain * 0.5f, GetSpellProto());
|
||||
break;
|
||||
}
|
||||
case SPELL_AURA_PERIODIC_HEAL:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue