josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Misc: Fix code style and a typo for recently merged in PRs

Browse Source
This commit is contained in:
Nay
2012-08-03 00:20:44 +01:00
parent 2060a2037a
commit f859088699
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/Auras/SpellAuras.cpp
+16 -6
View File
@@ -1594,10 +1594,13 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b
{ {
case 19746: case 19746:
// Improved concentration aura - linked aura // Improved concentration aura - linked aura
if (caster->HasAura(20254) || caster->HasAura(20255) || caster->HasAura(20256)) if (caster->HasAura(20254) || caster->HasAura(20255) || caster->HasAura(20256))
{
if (apply) if (apply)
target->CastSpell(target, 63510, true); target->CastSpell(target, 63510, true);
else target->RemoveAura(63510); else
target->RemoveAura(63510);
}
case 31821: case 31821:
// Aura Mastery Triggered Spell Handler // Aura Mastery Triggered Spell Handler
// If apply Concentration Aura -> trigger -> apply Aura Mastery Immunity // If apply Concentration Aura -> trigger -> apply Aura Mastery Immunity
@@ -1606,6 +1609,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b
// Do effects only on aura owner // Do effects only on aura owner
if (GetCasterGUID() != target->GetGUID()) if (GetCasterGUID() != target->GetGUID())
break; break;
if (apply) if (apply)
{ {
if ((GetSpellInfo()->Id == 31821 && target->HasAura(19746, GetCasterGUID())) || (GetSpellInfo()->Id == 19746 && target->HasAura(31821))) if ((GetSpellInfo()->Id == 31821 && target->HasAura(19746, GetCasterGUID())) || (GetSpellInfo()->Id == 19746 && target->HasAura(31821)))
@@ -1625,19 +1629,25 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b
} }
break; break;
} }
if (GetSpellInfo()->GetSpellSpecific() == SPELL_SPECIFIC_AURA) if (GetSpellInfo()->GetSpellSpecific() == SPELL_SPECIFIC_AURA)
{ {
// Improved devotion aura // Improved devotion aura
if (caster->HasAura(20140) || caster->HasAura(20138) || caster->HasAura(20139)) if (caster->HasAura(20140) || caster->HasAura(20138) || caster->HasAura(20139))
{
if (apply) if (apply)
caster->CastSpell(target, 63514, true); caster->CastSpell(target, 63514, true);
else target->RemoveAura(63514); else
target->RemoveAura(63514);
}
// 63531 - linked aura for both Sanctified Retribution and Swift Retribution talents // 63531 - linked aura for both Sanctified Retribution and Swift Retribution talents
// Not allow for Retribution Aura (prevent stacking) // Not allow for Retribution Aura (prevent stacking)
if ((GetSpellInfo()->SpellIconID != 555) && (caster->HasAura(53648) || caster->HasAura(53484) || caster->HasAura(53379) || caster->HasAura(31869))) if ((GetSpellInfo()->SpellIconID != 555) && (caster->HasAura(53648) || caster->HasAura(53484) || caster->HasAura(53379) || caster->HasAura(31869)))
{
if (apply) if (apply)
caster->CastSpell(target, 63531, true); caster->CastSpell(target, 63531, true);
else target->RemoveAura(63531); else
target->RemoveAura(63531);
}
} }
break; break;
case SPELLFAMILY_DEATHKNIGHT: case SPELLFAMILY_DEATHKNIGHT:
src/server/scripts/Commands/cs_disable.cpp
+1 -1
View File
@@ -124,7 +124,7 @@ public:
PreparedStatement* stmt2 = WorldDatabase.GetPreparedStatement(WORLD_INS_DISABLES); PreparedStatement* stmt2 = WorldDatabase.GetPreparedStatement(WORLD_INS_DISABLES);
stmt2->setUInt32(0, entry); stmt2->setUInt32(0, entry);
stmt2->setUInt8(1, disableType); stmt2->setUInt8(1, disableType);
stmt->setUInt16(2, flags); stmt2->setUInt16(2, flags);
stmt2->setString(3, disableComment); stmt2->setString(3, disableComment);
WorldDatabase.Execute(stmt2); WorldDatabase.Execute(stmt2);