aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/game/SpellEffects.cpp2
-rw-r--r--src/game/Unit.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 3807b6f1e78..72d59694632 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -3281,8 +3281,10 @@ void Spell::EffectSummonType(uint32 i)
{
default:
if (properties->Flags & 512)
+ {
SummonGuardian(entry, properties);
break;
+ }
switch(properties->Type)
{
case SUMMON_TYPE_PET:
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 0a8e7dae7fc..56d3653abd2 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -219,7 +219,7 @@ void Unit::Update( uint32 p_time )
SendThreatListUpdate();
// update combat timer only for players and pets (only pets with PetAI)
- if (isInCombat() && (GetTypeId() == TYPEID_PLAYER || (((Creature *)this)->isPet()) && IsControlledByPlayer()))
+ if (isInCombat() && (GetTypeId() == TYPEID_PLAYER || (((Creature *)this)->isPet() && IsControlledByPlayer())))
{
// Check UNIT_STAT_MELEE_ATTACKING or UNIT_STAT_CHASE (without UNIT_STAT_FOLLOW in this case) so pets can reach far away
// targets without stopping half way there and running off.