Kitzunu 2021-01-10 14:27:55 +01:00 committed by GitHub
parent 7cf097eab2
commit da4edd547d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
315 changed files with 3 additions and 729 deletions

View file

@ -2375,7 +2375,6 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(const Unit* victim, WeaponAttackTy
MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(const Unit* victim, WeaponAttackType attType, int32 crit_chance, int32 miss_chance, int32 dodge_chance, int32 parry_chance, int32 block_chance) const
{
if (victim->GetTypeId() == TYPEID_UNIT && victim->ToCreature()->IsEvadingAttacks())
return MELEE_HIT_EVADE;
@ -9929,7 +9928,6 @@ void Unit::ModifyAuraState(AuraStateType flag, bool apply)
if( AuraApplication* aurApp = (*itr).second->GetApplicationOfTarget(GetGUID()) )
(*itr).second->HandleAllEffects(aurApp, AURA_EFFECT_HANDLE_REAL, true);
}
}
}
else
@ -11297,7 +11295,6 @@ int32 Unit::SpellBaseDamageBonusDone(SpellSchoolMask schoolMask)
for (AuraEffectList::const_iterator i = mDamageDonebyAP.begin(); i != mDamageDonebyAP.end(); ++i)
if ((*i)->GetMiscValue() & schoolMask)
DoneAdvertisedBenefit += int32(CalculatePct(GetTotalAttackPowerValue(BASE_ATTACK), (*i)->GetAmount()));
}
return DoneAdvertisedBenefit;
}
@ -12766,7 +12763,6 @@ void Unit::Dismount()
void Unit::SetInCombatWith(Unit* enemy, uint32 duration)
{
// Xinef: Dont allow to start combat with triggers
if (enemy->GetTypeId() == TYPEID_UNIT && enemy->ToCreature()->IsTrigger())
return;
@ -12793,7 +12789,6 @@ void Unit::SetInCombatWith(Unit* enemy, uint32 duration)
void Unit::CombatStart(Unit* target, bool initialAggro)
{
// Xinef: Dont allow to start combat with triggers
if (target->GetTypeId() == TYPEID_UNIT && target->ToCreature()->IsTrigger())
return;
@ -13078,7 +13073,6 @@ bool Unit::_IsValidAttackTarget(Unit const* target, SpellInfo const* bySpell, Wo
if (FactionState const* repState = player->GetReputationMgr().GetState(factionEntry))
if (!(repState->Flags & FACTION_FLAG_AT_WAR))
return false;
}
}
}
@ -14081,7 +14075,6 @@ int32 Unit::ModSpellDuration(SpellInfo const* spellProto, Unit const* target, in
{
// else positive mods here, there are no currently
// when there will be, change GetTotalAuraModifierByMiscValue to GetTotalPositiveAuraModifierByMiscValue
}
// Glyphs which increase duration of selfcasted buffs
@ -15762,7 +15755,6 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* target, uint32 procFlag, u
takeCharges = true;
else if (triggeredByAura->GetAmount()) // aura must have amount
{
int32 damageLeft = triggeredByAura->GetAmount();
// No damage left
if (damageLeft < int32(damage))
@ -16339,7 +16331,6 @@ float Unit::CalculateDefaultCoefficient(SpellInfo const* spellInfo, DamageEffect
float DotFactor = 1.0f;
if (damagetype == DOT)
{
int32 DotDuration = spellInfo->GetDuration();
if (!spellInfo->IsChanneled() && DotDuration > 0)
DotFactor = DotDuration / 15000.0f;
@ -16740,7 +16731,6 @@ bool Unit::HandleAuraRaidProcFromChargeWithValue(AuraEffect* triggeredByAura)
// heal
CastCustomSpell(this, 33110, &heal, nullptr, nullptr, true, nullptr, nullptr, caster_guid);
return true;
}
bool Unit::HandleAuraRaidProcFromCharge(AuraEffect* triggeredByAura)
{