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

Fix Preserved Holly. Patch by laise. Closes #822.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
p0wer
2009-12-20 18:51:10 -06:00
parent e55710fc68
commit 34fe36ecac
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/SpellAuras.cpp
+20 -2
View File
@@ -2979,6 +2979,10 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount)
if(m_target->GetTypeId() == TYPEID_PLAYER) if(m_target->GetTypeId() == TYPEID_PLAYER)
((Player*)m_target)->RemoveAmmo(); // not use ammo and not allow use ((Player*)m_target)->RemoveAmmo(); // not use ammo and not allow use
return; return;
case 62061: // Festive Holiday Mount
if(m_target->HasAuraType(SPELL_AURA_MOUNTED))
m_target->CastSpell(m_target, 25860, true, NULL, this); // Reindeer Transformation
return;
case 52916: // Honor Among Thieves case 52916: // Honor Among Thieves
if(m_target->GetTypeId() == TYPEID_PLAYER) if(m_target->GetTypeId() == TYPEID_PLAYER)
if (Unit * target = ObjectAccessor::GetUnit(*m_target,((Player*)m_target)->GetComboTarget())) if (Unit * target = ObjectAccessor::GetUnit(*m_target,((Player*)m_target)->GetComboTarget()))
@@ -4438,12 +4442,19 @@ void AuraEffect::HandleAuraModIncreaseSpeed(bool apply, bool Real, bool changeAm
m_target->UpdateSpeed(MOVE_RUN, true); m_target->UpdateSpeed(MOVE_RUN, true);
} }
void AuraEffect::HandleAuraModIncreaseMountedSpeed(bool /*apply*/, bool Real, bool changeAmount) void AuraEffect::HandleAuraModIncreaseMountedSpeed(bool apply, bool Real, bool changeAmount)
{ {
// all applied/removed only at real aura add/remove // all applied/removed only at real aura add/remove
if(!Real && !changeAmount) if(!Real && !changeAmount)
return; return;
if(apply)
{
// Festive Holiday Mount
if(m_target->HasAura(62061) && GetSpellProto()->SpellIconID != 1794)
m_target->CastSpell(m_target, 25860, true, NULL, this); // Reindeer Transformation
}
m_target->UpdateSpeed(MOVE_RUN, true); m_target->UpdateSpeed(MOVE_RUN, true);
} }
@@ -4469,9 +4480,16 @@ void AuraEffect::HandleAuraModIncreaseFlightSpeed(bool apply, bool Real, bool ch
if (m_target->GetTypeId() == TYPEID_PLAYER) if (m_target->GetTypeId() == TYPEID_PLAYER)
m_target->ApplySpellImmune(GetId(),IMMUNITY_MECHANIC,MECHANIC_POLYMORPH,apply); m_target->ApplySpellImmune(GetId(),IMMUNITY_MECHANIC,MECHANIC_POLYMORPH,apply);
if(apply)
{
// Dragonmaw Illusion (overwrite mount model, mounted aura already applied) // Dragonmaw Illusion (overwrite mount model, mounted aura already applied)
if( apply && m_target->HasAuraEffect(42016,0) && m_target->GetMountID()) if(m_target->HasAuraEffect(42016,0) && m_target->GetMountID())
m_target->SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID,16314); m_target->SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID,16314);
// Festive Holiday Mount
if(m_target->HasAura(62061) && GetSpellProto()->SpellIconID != 1794)
m_target->CastSpell(m_target, 25860, true, NULL, this); // Reindeer Transformation
}
} }
m_target->UpdateSpeed(MOVE_FLIGHT, true); m_target->UpdateSpeed(MOVE_FLIGHT, true);