aboutsummaryrefslogtreecommitdiff
path: root/src/game/Unit.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2008-12-30 20:05:36 -0600
committermegamage <none@none>2008-12-30 20:05:36 -0600
commitaa3b89d7764c093ba87ee2cf99775e3aedc37637 (patch)
treef6a403e42332dab84f77d7a611dc375083452875 /src/game/Unit.cpp
parent05301f91b90fc029af6df5717a6b48f0e1759008 (diff)
parent12d4ce413e7b3b9d697b160bac6c918564b2fd1e (diff)
*Update to HG 714.
--HG-- branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
-rw-r--r--src/game/Unit.cpp12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 5721a708e3c..56284ca5f6b 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -10675,7 +10675,7 @@ uint32 Unit::GetCastingTimeForBonus( SpellEntry const *spellProto, DamageEffectT
return CastingTime;
}
-void Unit::UpdateAuraForGroup(uint8 slot, bool apply)
+void Unit::UpdateAuraForGroup(uint8 slot)
{
if(GetTypeId() == TYPEID_PLAYER)
{
@@ -10683,10 +10683,7 @@ void Unit::UpdateAuraForGroup(uint8 slot, bool apply)
if(player->GetGroup())
{
player->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_AURAS);
- if(apply)
- player->SetAuraUpdateMask(slot);
- else
- player->UnsetAuraUpdateMask(slot);
+ player->SetAuraUpdateMask(slot);
}
}
else if(GetTypeId() == TYPEID_UNIT && ((Creature*)this)->isPet())
@@ -10698,10 +10695,7 @@ void Unit::UpdateAuraForGroup(uint8 slot, bool apply)
if(owner && (owner->GetTypeId() == TYPEID_PLAYER) && ((Player*)owner)->GetGroup())
{
((Player*)owner)->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_PET_AURAS);
- if(apply)
- pet->SetAuraUpdateMask(slot);
- else
- pet->UnsetAuraUpdateMask(slot);
+ pet->SetAuraUpdateMask(slot);
}
}
}