Cleanup

--HG--
branch : trunk

src/game/CreatureEventAI.cpp

@@ -584,12 +584,9 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
                         m_creature->SendMeleeAttackStart(victim);
                     } 
                     if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == IDLE_MOTION_TYPE)
-                    {
-                        //m_creature->GetMotionMaster()->Clear(false);
                         m_creature->GetMotionMaster()->MoveChase(victim, AttackDistance, AttackAngle); // Targeted movement generator will start melee automatically, no need to send it explicitly
                 }
             }
-            }
             else
             {    
                 if (m_creature->isInCombat())
@@ -601,13 +598,9 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
                         m_creature->SendMeleeAttackStop(victim);
                     }    
                     if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE)
-                    {
-                        //m_creature->StopMoving();
-                        //m_creature->GetMotionMaster()->Clear(false);
                         m_creature->GetMotionMaster()->MoveIdle();
                 }
             }
-            }
             break;
         case ACTION_T_SET_PHASE:
             Phase = action.set_phase.phase;

src/game/SpellAuras.cpp

@@ -1415,8 +1415,6 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster,
             // Drain Soul - If the target is at or below 25% health, Drain Soul causes four times the normal damage
             if (GetSpellProto()->SpellFamilyFlags[0] & 0x00004000)
             {
-                if (!target)
-                    break;
                 if (apply)
                 {
                     if (target != caster && target->GetHealth() <= target->GetMaxHealth() / 4)

src/game/Unit.cpp

@@ -14796,11 +14796,9 @@ void Unit::SetControlled(bool apply, UnitState state)
         switch(state)
         {
             case UNIT_STAT_STUNNED:
-	   {
                 addUnitState(state);
                 SetStunned(true);
                 CastStop();
-	   }
                 break;
             case UNIT_STAT_ROOT:
                 if (!hasUnitState(UNIT_STAT_STUNNED))