From e587d8c1afdf28e62bb51accdc57d3f1c405fa4a Mon Sep 17 00:00:00 2001 From: click Date: Sat, 3 Nov 2012 15:04:30 +0100 Subject: Core. Fix non-PCH building (again)... --- src/server/scripts/Events/childrens_week.cpp | 1 + src/server/scripts/Northrend/sholazar_basin.cpp | 1 + 2 files changed, 2 insertions(+) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Events/childrens_week.cpp b/src/server/scripts/Events/childrens_week.cpp index c4d3650868d..763961271d8 100644 --- a/src/server/scripts/Events/childrens_week.cpp +++ b/src/server/scripts/Events/childrens_week.cpp @@ -17,6 +17,7 @@ #include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "SpellAuras.h" enum Orphans { diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp index 14319d26cf5..63960f13bb7 100644 --- a/src/server/scripts/Northrend/sholazar_basin.cpp +++ b/src/server/scripts/Northrend/sholazar_basin.cpp @@ -33,6 +33,7 @@ EndContentData */ #include "ScriptedGossip.h" #include "ScriptedEscortAI.h" #include "SpellScript.h" +#include "SpellAuras.h" /*###### ## npc_injured_rainspeaker_oracle -- cgit v1.2.3 From dd2e02f157cec687eb634b37267aa54eaa16baf6 Mon Sep 17 00:00:00 2001 From: ille Date: Mon, 5 Nov 2012 12:44:45 +0100 Subject: Core/Scripts: tweak code in pyrewood_ambushAI::SummonCreatureWithRandomTarget() --- .../scripts/EasternKingdoms/silverpine_forest.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'src/server/scripts') 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); } } -- cgit v1.2.3