*Merge.

--HG--
branch : trunk

1 files changed, 24 insertions, 1 deletions

diff --git a/src/game/NullCreatureAI.cpp b/src/game/NullCreatureAI.cpp
index 33218251718..2745dd3ea8d 100644
--- a/src/game/NullCreatureAI.cpp
+++ b/src/game/NullCreatureAI.cpp
@@ -27,6 +27,30 @@ void PassiveAI::UpdateAI(const uint32)
         EnterEvadeMode();
 }
 
+void PossessedAI::UpdateAI(const uint32 diff)
+{
+    if(me->getVictim())
+    {
+        if(!me->canAttack(me->getVictim()))
+            me->AttackStop();
+        else
+            DoMeleeAttackIfReady();
+    }
+}
+
+void PossessedAI::JustDied(Unit *u)
+{
+    // We died while possessed, disable our loot
+    me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
+}
+
+void PossessedAI::KilledUnit(Unit* victim)
+{
+    // We killed a creature, disable victim's loot
+    if (victim->GetTypeId() == TYPEID_UNIT)
+        victim->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
+}
+
 void CritterAI::DamageTaken(Unit *done_by, uint32 &)
 {
     if(!me->hasUnitState(UNIT_STAT_FLEEING))
@@ -39,4 +63,3 @@ void CritterAI::EnterEvadeMode()
         me->SetControlled(false, UNIT_STAT_FLEEING);
     CreatureAI::EnterEvadeMode();
 }
-