From 974fad377e6f9479d5beb9bca7c51eb8451766a3 Mon Sep 17 00:00:00 2001
From: QAston <none@none>
Date: Wed, 22 Jul 2009 20:22:36 +0200
Subject: [PATCH] *Fix a typo breaking some summon types.

--HG--
branch : trunk
---
 src/game/SpellEffects.cpp | 2 ++
 src/game/Unit.cpp         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 3807b6f1e7..72d5969463 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 0a8e7dae7f..56d3653abd 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.