*Fix some typos, by Darkshines

*More Fix About NPC dont regenerate HP, by Gyullo

--HG--
branch : trunk

3 files changed, 9 insertions, 6 deletions

diff --git a/sql/FULL/world_script_texts.sql b/sql/FULL/world_script_texts.sql
index 196301464c3..f45ea8f603e 100644
--- a/sql/FULL/world_script_texts.sql
+++ b/sql/FULL/world_script_texts.sql
@@ -395,9 +395,9 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
    (18210,-1000486,'Ride the lightning, filth!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'maghar captive SAY_MAG_LIGHTNING'),
    (18210,-1000487,'FROST SHOCK!!!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'maghar captive SAY_MAG_SHOCK'),
    (18210,-1000488,'It is best that we split up now, in case they send more after us. Hopefully one of us will make it back to Garrosh. Farewell stranger.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'maghar captive SAY_MAG_COMPLETE'),
-   (17077,-1000496,'%s lifts its head into the air, as if listening for something.',0,2,0,0,'ancestral wolf EMOTE_WOLF_LIFT_HEAD'),
-   (17077,-1000497,'%s lets out a howl that rings across the mountains to the north and motions for you to follow.',0,2,0,0,'ancestral wolf EMOTE_WOLF_HOWL'),
-   (17077,-1000498,'Welcome, kind spirit. What has brought you to us?',0,0,0,0,'ancestral wolf SAY_WOLF_WELCOME'),
+   (17077,-1000496,'%s lifts its head into the air, as if listening for something.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0,'ancestral wolf EMOTE_WOLF_LIFT_HEAD'),
+   (17077,-1000497,'%s lets out a howl that rings across the mountains to the north and motions for you to follow.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0,'ancestral wolf EMOTE_WOLF_HOWL'),
+   (17077,-1000498,'Welcome, kind spirit. What has brought you to us?',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'ancestral wolf SAY_WOLF_WELCOME'),
 
 -- -1 033 000 SHADOWFANG KEEP
    (0,-1033000,'Follow me and I''ll open the courtyard door for you.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,7,1,'prisoner ashcrombe SAY_FREE_AS'),
diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql
index 3d877c99e27..d8978930f12 100644
--- a/sql/FULL/world_scripts_full.sql
+++ b/sql/FULL/world_scripts_full.sql
@@ -1333,7 +1333,7 @@ insert into `event_scripts` (`id`, `delay`, `command`, `datalong`, `datalong2`,
 update creature set spawnMask=0 where guid = 85587;
 
 -- Quest - The Warsong Farms
-DELETE FROM `creature_ai_scripts` WHERE `creature_id`=25669;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id` IN (25669,25671,25672);
 INSERT INTO `creature_ai_scripts`
 (`id`, `creature_id`, `event_type`, `event_inverse_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action1_type`, `action1_param1`, `action1_param2`, `action1_param3`, `action2_type`, `action2_param1`, `action2_param2`, `action2_param3`, `action3_type`, `action3_param1`, `action3_param2`, `action3_param3`, `comment`)
 VALUES
diff --git a/src/game/CreatureAIImpl.h b/src/game/CreatureAIImpl.h
index b35d5d7ed01..58c78522888 100644
--- a/src/game/CreatureAIImpl.h
+++ b/src/game/CreatureAIImpl.h
@@ -265,7 +265,7 @@ inline void CreatureAI::SetGazeOn(Unit *target)
     if(me->canAttack(target))
     {
         AttackStart(target);
-        me->SetReactState(REACT_PASSIVE);
+        me->SetReactState(REACT_AGGRESSIVE);
     }
 }
 
@@ -301,6 +301,7 @@ inline bool CreatureAI::UpdateCombatState()
     else if(me->getThreatManager().isThreatListEmpty())
     {
         EnterEvadeMode();
+        me->SetReactState(REACT_PASSIVE);
         return false;
     }
 
@@ -321,6 +322,7 @@ inline bool CreatureAI::UpdateVictim()
     else if(me->getThreatManager().isThreatListEmpty())
     {
         EnterEvadeMode();
+        me->SetReactState(REACT_PASSIVE);
         return false;
     }
 
@@ -346,6 +348,7 @@ inline bool CreatureAI::_EnterEvadeMode()
     // sometimes bosses stuck in combat?
     me->DeleteThreatList();
     me->CombatStop(true);
+    me->ResetPlayerDamageReq();
 
     if(me->IsInEvadeMode())
         return false;
@@ -353,7 +356,7 @@ inline bool CreatureAI::_EnterEvadeMode()
     me->RemoveAllAuras();
     me->LoadCreaturesAddon();
     me->SetLootRecipient(NULL);
-    me->ResetPlayerDamageReq();
+    me->SetReactState(REACT_AGGRESSIVE);
 
     return true;
 }