7 files changed, 23 insertions, 30 deletions
diff --git a/sql/updates/world/2014_01_27_10_world_creature_model_info.sql b/sql/updates/world/2014_01_27_11_world_creature_model_info.sql
index adb94260fb9..adb94260fb9 100644
--- a/sql/updates/world/2014_01_27_10_world_creature_model_info.sql
+++ b/sql/updates/world/2014_01_27_11_world_creature_model_info.sql
diff --git a/sql/updates/world/2014_01_27_14_world_creature_template.sql b/sql/updates/world/2014_01_27_14_world_creature_template.sql
new file mode 100644
index 00000000000..97aa6fe0fbb
--- /dev/null
+++ b/sql/updates/world/2014_01_27_14_world_creature_template.sql
@@ -0,0 +1,3 @@
+--
+UPDATE `creature_template` SET `faction_A` = 514, `faction_H` = 514 WHERE `entry` IN (13326,22714,32062,37383,37402,37404);
+UPDATE `creature_template` SET `faction_A` = 1534, `faction_H` = 1534 WHERE `entry` IN (37407);
diff --git a/sql/updates/world/2014_01_27_15_world_creature_template.sql b/sql/updates/world/2014_01_27_15_world_creature_template.sql
new file mode 100644
index 00000000000..d4ac82122c5
--- /dev/null
+++ b/sql/updates/world/2014_01_27_15_world_creature_template.sql
@@ -0,0 +1,3 @@
+--
+UPDATE `creature_template` SET `faction_A` = 26, `faction_H` = 26 WHERE `entry` IN (37469,37470,37473);
+UPDATE `creature_template` SET `faction_A` = 1214, `faction_H` = 1214 WHERE `entry` IN (13397,22745,32016);
diff --git a/sql/updates/world/2014_01_27_16_world_creature_template.sql b/sql/updates/world/2014_01_27_16_world_creature_template.sql
new file mode 100644
index 00000000000..cf928d315d7
--- /dev/null
+++ b/sql/updates/world/2014_01_27_16_world_creature_template.sql
@@ -0,0 +1,3 @@
+--
+UPDATE `creature_template` SET `faction_A` = 59, `faction_H` = 59 WHERE `entry` IN (13099,22741,32012,37331,37340,37337,37366);
+UPDATE `creature_template` SET `faction_A` = 39, `faction_H` = 39 WHERE `entry` IN (37475);
diff --git a/sql/updates/world/2014_01_27_17_world_creature_template.sql b/sql/updates/world/2014_01_27_17_world_creature_template.sql
new file mode 100644
index 00000000000..a2ab1383b61
--- /dev/null
+++ b/sql/updates/world/2014_01_27_17_world_creature_template.sql
@@ -0,0 +1,3 @@
+--
+UPDATE `creature_template` SET `faction_A` = 83, `faction_H` = 83 WHERE `entry` IN (35405,37323);
+UPDATE `creature_template` SET `faction_A` = 1215, `faction_H` = 1215 WHERE `entry` IN (37481);
diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp
index 54f4aa8b32e..20448e79fb7 100644
--- a/src/server/scripts/Spells/spell_druid.cpp
+++ b/src/server/scripts/Spells/spell_druid.cpp
@@ -1197,12 +1197,23 @@ class spell_dru_wild_growth : public SpellScriptLoader
                     targets.sort(Trinity::HealthPctOrderPred());
                     targets.resize(maxTargets);
                 }
+
+                _targets = targets;
+            }
+
+            void SetTargets(std::list<WorldObject*>& targets)
+            {
+                targets = _targets;
             }
 
             void Register() OVERRIDE
             {
                 OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dru_wild_growth_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY);
+                OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dru_wild_growth_SpellScript::SetTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ALLY);
             }
+
+        private:
+            std::list<WorldObject*> _targets;
         };
 
         SpellScript* GetSpellScript() const OVERRIDE
diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp
index bd1d04d146a..abb14a9cc5d 100644
--- a/src/server/scripts/Spells/spell_paladin.cpp
+++ b/src/server/scripts/Spells/spell_paladin.cpp
@@ -876,35 +876,6 @@ class spell_pal_judgement : public SpellScriptLoader
         }
 };
 
-// 20425 - Judgement of Command
-class spell_pal_judgement_of_command : public SpellScriptLoader
-{
-    public:
-        spell_pal_judgement_of_command() : SpellScriptLoader("spell_pal_judgement_of_command") { }
-
-        class spell_pal_judgement_of_command_SpellScript : public SpellScript
-        {
-            PrepareSpellScript(spell_pal_judgement_of_command_SpellScript);
-
-            void HandleDummy(SpellEffIndex /*effIndex*/)
-            {
-                if (Unit* unitTarget = GetHitUnit())
-                    if (SpellInfo const* spell_proto = sSpellMgr->GetSpellInfo(GetEffectValue()))
-                        GetCaster()->CastSpell(unitTarget, spell_proto, true, NULL);
-            }
-
-            void Register() OVERRIDE
-            {
-                OnEffectHitTarget += SpellEffectFn(spell_pal_judgement_of_command_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
-            }
-        };
-
-        SpellScript* GetSpellScript() const OVERRIDE
-        {
-            return new spell_pal_judgement_of_command_SpellScript();
-        }
-};
-
 // 633 - Lay on Hands
 class spell_pal_lay_on_hands : public SpellScriptLoader
 {
@@ -1194,7 +1165,6 @@ void AddSC_paladin_spell_scripts()
     new spell_pal_improved_aura_effect("spell_pal_sanctified_retribution_effect");
     new spell_pal_item_healing_discount();
     new spell_pal_judgement();
-    new spell_pal_judgement_of_command();
     new spell_pal_lay_on_hands();
     new spell_pal_righteous_defense();
     new spell_pal_sacred_shield();