EAI: Fix EVENT_T_DEATH not working with two layers deep PCs and fix n…

…pcs not being checked against cond

doc/EventAI.txt

@@ -257,7 +257,7 @@ NOTE: For Repeat Events the Repeat Timer ONLY Re-Check's Event Conditions to see
 ------------------
 6 = EVENT_T_DEATH:
 ------------------
-Parameter 1: ConditionId - condition from Conditions table
+Parameter 1: ConditionId - condition from Conditions table - executed on either controlling player or killer
 
 BOTH - This Event Expires upon Death of the Scripted NPC. This is normally only used in combat though.
 This is commonly used for NPC's who have a Yell or Spell Cast when they Die.

src/game/AI/EventAI/CreatureEventAI.cpp

@@ -370,9 +370,12 @@ bool CreatureEventAI::CheckEvent(CreatureEventAIHolder& holder, Unit* actionInvo
                 if (!actionInvoker)
                     return false;
 
-                if (Player* player = actionInvoker->GetBeneficiaryPlayer())
-                    if (!sObjectMgr.IsConditionSatisfied(event.death.conditionId, player, player->GetMap(), m_creature, CONDITION_FROM_EVENTAI))
-                        return false;
+                Unit const* controller = actionInvoker->GetControllingPlayer();
+                if (!controller) // only allow going forward if we can evaluate condition
+                    controller = actionInvoker;
+
+                if (!sObjectMgr.IsConditionSatisfied(event.death.conditionId, controller, controller->GetMap(), m_creature, CONDITION_FROM_EVENTAI))
+                    return false;
             }
             break;
         case EVENT_T_EVADE: