Merge pull request #8258 from ille/pointercheck

Core/Scripts: tweak code in pyrewood_ambushAI::SummonCreatureWithRandomT...

1 files changed, 8 insertions, 10 deletions

diff --git a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp
index c52e69787d4..b2cd3b16e7b 100644
--- a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp
+++ b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp
@@ -232,18 +232,16 @@ public:
             {
                 Unit* target = NULL;
                 if (PlayerGUID)
-                {
-                    if (Unit* player = Unit::GetPlayer(*me, PlayerGUID)->ToUnit())
-                        target = RAND((Unit*)me, player);
-                } else
+                    if (Player* player = Unit::GetPlayer(*me, PlayerGUID))
+                        if (player->isAlive() && RAND(0, 1))
+                            target = player;
+
+                if (!target)
                     target = me;
 
-                if (target)
-                {
-                    summoned->setFaction(168);
-                    summoned->AddThreat(target, 32.0f);
-                    summoned->AI()->AttackStart(target);
-                }
+                summoned->setFaction(168);
+                summoned->AddThreat(target, 32.0f);
+                summoned->AI()->AttackStart(target);
             }
         }