mirror of
https://github.com/mangosfour/server.git
synced 2025-12-15 01:37:00 +00:00
[8639] Fixed tabs and trailing whitespaces.
This commit is contained in:
parent
9fd4965299
commit
ec2fd7396f
4 changed files with 9 additions and 9 deletions
|
|
@ -5882,7 +5882,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// original heal must be form beacon caster
|
// original heal must be form beacon caster
|
||||||
if (!dummy)
|
if (!dummy)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
|
@ -7121,7 +7121,7 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB
|
||||||
case 53817:
|
case 53817:
|
||||||
{
|
{
|
||||||
// have rank dependent proc chance, ignore too often cases
|
// have rank dependent proc chance, ignore too often cases
|
||||||
// PPM = 2.5 * (rank of talent),
|
// PPM = 2.5 * (rank of talent),
|
||||||
uint32 rank = spellmgr.GetSpellRank(auraSpellInfo->Id);
|
uint32 rank = spellmgr.GetSpellRank(auraSpellInfo->Id);
|
||||||
// 5 rank -> 100% 4 rank -> 80% and etc from full rate
|
// 5 rank -> 100% 4 rank -> 80% and etc from full rate
|
||||||
if(!roll_chance_i(20*rank))
|
if(!roll_chance_i(20*rank))
|
||||||
|
|
@ -8273,12 +8273,12 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
|
||||||
// Glyph of Ice Lance
|
// Glyph of Ice Lance
|
||||||
if (Aura* glyph = GetDummyAura(56377))
|
if (Aura* glyph = GetDummyAura(56377))
|
||||||
multiplier = glyph->GetModifier()->m_amount;
|
multiplier = glyph->GetModifier()->m_amount;
|
||||||
|
|
||||||
DoneTotalMod *= multiplier;
|
DoneTotalMod *= multiplier;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Torment the weak affected (Arcane Barrage, Arcane Blast, Frostfire Bolt, Arcane Missiles, Fireball)
|
// Torment the weak affected (Arcane Barrage, Arcane Blast, Frostfire Bolt, Arcane Missiles, Fireball)
|
||||||
if ((spellProto->SpellFamilyFlags & UI64LIT(0x0000900020200021)) &&
|
if ((spellProto->SpellFamilyFlags & UI64LIT(0x0000900020200021)) &&
|
||||||
(pVictim->HasAuraType(SPELL_AURA_MOD_DECREASE_SPEED) || pVictim->HasAuraType(SPELL_AURA_MELEE_SLOW)))
|
(pVictim->HasAuraType(SPELL_AURA_MOD_DECREASE_SPEED) || pVictim->HasAuraType(SPELL_AURA_MELEE_SLOW)))
|
||||||
{
|
{
|
||||||
//Search for Torment the weak dummy aura
|
//Search for Torment the weak dummy aura
|
||||||
|
|
@ -8595,7 +8595,7 @@ bool Unit::isSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolM
|
||||||
for(AuraList::const_iterator i = mDummyAuras.begin(); i!= mDummyAuras.end(); ++i)
|
for(AuraList::const_iterator i = mDummyAuras.begin(); i!= mDummyAuras.end(); ++i)
|
||||||
{
|
{
|
||||||
// Improved Flash Heal
|
// Improved Flash Heal
|
||||||
if ((*i)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_PRIEST &&
|
if ((*i)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_PRIEST &&
|
||||||
(*i)->GetSpellProto()->SpellIconID == 2542)
|
(*i)->GetSpellProto()->SpellIconID == 2542)
|
||||||
{
|
{
|
||||||
crit_chance+=(*i)->GetModifier()->m_amount;
|
crit_chance+=(*i)->GetModifier()->m_amount;
|
||||||
|
|
@ -9333,7 +9333,7 @@ uint32 Unit::MeleeDamageBonus(Unit *pVictim, uint32 pdamage,WeaponAttackType att
|
||||||
DoneFlat *= (CastingTime / 3500.0f) * DotFactor * LvlPenalty;
|
DoneFlat *= (CastingTime / 3500.0f) * DotFactor * LvlPenalty;
|
||||||
TakenFlat*= (CastingTime / 3500.0f) * DotFactor * LvlPenalty;
|
TakenFlat*= (CastingTime / 3500.0f) * DotFactor * LvlPenalty;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// weapon damage based spells
|
// weapon damage based spells
|
||||||
else if( APbonus || DoneFlat )
|
else if( APbonus || DoneFlat )
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -377,7 +377,7 @@ int Master::Run()
|
||||||
|
|
||||||
cliThread->wait();
|
cliThread->wait();
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
cliThread->destroy();
|
cliThread->destroy();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -182,7 +182,7 @@ ACE_THR_FUNC_RETURN Thread::ThreadTask(void * param)
|
||||||
Runnable * _task = (Runnable*)param;
|
Runnable * _task = (Runnable*)param;
|
||||||
_task->run();
|
_task->run();
|
||||||
|
|
||||||
// task execution complete, free referecne added at
|
// task execution complete, free referecne added at
|
||||||
_task->decReference();
|
_task->decReference();
|
||||||
|
|
||||||
return (ACE_THR_FUNC_RETURN)0;
|
return (ACE_THR_FUNC_RETURN)0;
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "8638"
|
#define REVISION_NR "8639"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue