*Merge.

--HG--
branch : trunk

src/game/Map.cpp

@@ -1015,7 +1015,6 @@ bool Map::CreatureCellRelocation(Creature *c, Cell new_cell)
 
             RemoveFromGrid(c,getNGrid(old_cell.GridX(), old_cell.GridY()),old_cell);
             AddToGrid(c,getNGrid(new_cell.GridX(), new_cell.GridY()),new_cell);
-            c->SetCurrentCell(new_cell);
         }
         else
         {
@@ -1040,7 +1039,6 @@ bool Map::CreatureCellRelocation(Creature *c, Cell new_cell)
 
         RemoveFromGrid(c,getNGrid(old_cell.GridX(), old_cell.GridY()),old_cell);
         AddToGrid(c,getNGrid(new_cell.GridX(), new_cell.GridY()),new_cell);
-        c->SetCurrentCell(new_cell);
 
         return true;
     }
@@ -1056,7 +1054,6 @@ bool Map::CreatureCellRelocation(Creature *c, Cell new_cell)
         RemoveFromGrid(c,getNGrid(old_cell.GridX(), old_cell.GridY()),old_cell);
         EnsureGridCreated(GridPair(new_cell.GridX(), new_cell.GridY()));
         AddToGrid(c,getNGrid(new_cell.GridX(), new_cell.GridY()),new_cell);
-        c->SetCurrentCell(new_cell);
 
         return true;
     }
@@ -1730,7 +1727,7 @@ void Map::AddToActive( Creature* c )
     AddToActiveHelper(c);
 
     // also not allow unloading spawn grid to prevent creating creature clone at load
-    if(c->GetDBTableGUIDLow())
+    if(!c->isPet() && c->GetDBTableGUIDLow())
     {
         float x,y,z;
         c->GetRespawnCoord(x,y,z);
@@ -1751,7 +1748,7 @@ void Map::RemoveFromActive( Creature* c )
     RemoveFromActiveHelper(c);
 
     // also allow unloading spawn grid
-    if(c->GetDBTableGUIDLow())
+    if(!c->isPet() && c->GetDBTableGUIDLow())
     {
         float x,y,z;
         c->GetRespawnCoord(x,y,z);

src/game/PetHandler.cpp

@@ -124,10 +124,8 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data )
                         if (pet->getVictim())
                             pet->AttackStop();
 
-                        if(pet->GetTypeId() != TYPEID_PLAYER)
+                        if(pet->GetTypeId() != TYPEID_PLAYER && ((Creature*)pet)->IsAIEnabled)
                         {
-                            pet->GetMotionMaster()->Clear();
-                            if (((Creature*)pet)->IsAIEnabled)
                             ((Creature*)pet)->AI()->AttackStart(TargetUnit);
 
                             //10% chance to play special pet attack talk, else growl

src/game/SpellAuras.cpp

@@ -6536,11 +6536,14 @@ void Aura::HandleModPossessPet(bool apply, bool Real)
     Unit* caster = GetCaster();
     if(!caster || caster->GetTypeId() != TYPEID_PLAYER)
         return;
+
+    if(apply)
+    {
         if(caster->GetPet() != m_target)
             return;    
     
-    if(apply)
         m_target->SetCharmedOrPossessedBy(caster, true);
+    }
     else
     {
         m_target->RemoveCharmedOrPossessedBy(caster);

src/game/Unit.cpp

@@ -7704,7 +7704,7 @@ bool Unit::AttackStop()
 
 void Unit::CombatStop(bool cast)
 {
-    if(cast& IsNonMeleeSpellCasted(false))
+    if(cast && IsNonMeleeSpellCasted(false))
         InterruptNonMeleeSpells(false);
 
     AttackStop();