diff options
| author | XTZGZoReX <none@none> | 2009-04-06 21:14:51 +0200 |
|---|---|---|
| committer | XTZGZoReX <none@none> | 2009-04-06 21:14:51 +0200 |
| commit | cc2a089a9d17f90423c6213419cd692786b15f15 (patch) | |
| tree | 0898d5ded038d0c414bae1d810708856dcda1eb5 /src/game/Pet.cpp | |
| parent | 8c13fe15d400aded239195c80fd3bd43b798efc2 (diff) | |
* Trailing whitespace removed.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Pet.cpp')
| -rw-r--r-- | src/game/Pet.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp index 35222ca6ec5..1d45ed3a7fd 100644 --- a/src/game/Pet.cpp +++ b/src/game/Pet.cpp @@ -1148,7 +1148,7 @@ void Pet::_SaveAuras() { // skip all auras from spell that apply at cast SPELL_AURA_MOD_SHAPESHIFT or pet area auras. // do not save single target auras (unless they were cast by the player) - if (itr->second->IsPassive() + if (itr->second->IsPassive() || (itr->second->GetCasterGUID() != GetGUID() && itr->second->IsSingleTarget())) continue; SpellEntry const *spellInfo = itr->second->GetSpellProto(); @@ -1168,8 +1168,8 @@ void Pet::_SaveAuras() CharacterDatabase.PExecute("INSERT INTO pet_aura (guid,caster_guid,spell,effect_mask,stackcount,amount0, amount1, amount2,maxduration,remaintime,remaincharges) " "VALUES ('%u', '" I64FMTD "', '%u', '%u', '%u', '%u', '%u', '%d', '%d', '%d', '%d')", - m_charmInfo->GetPetNumber(), itr->second->GetCasterGUID(),(uint32)itr->second->GetId(), (uint32)itr->second->GetEffectMask(), - (uint32)itr->second->GetStackAmount(), amounts[0], amounts[1], amounts[2] + m_charmInfo->GetPetNumber(), itr->second->GetCasterGUID(),(uint32)itr->second->GetId(), (uint32)itr->second->GetEffectMask(), + (uint32)itr->second->GetStackAmount(), amounts[0], amounts[1], amounts[2] ,int(itr->second->GetAuraMaxDuration()),int(itr->second->GetAuraDuration()),int(itr->second->GetAuraCharges())); } } |