Merge branch 'master' into 4.3.4

Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/World/World.h
	src/server/scripts/Kalimdor/moonglade.cpp

24 files changed, 555 insertions, 232 deletions

diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp
index 3d9e0486838..6535fe2be17 100644
--- a/src/server/game/AI/CoreAI/PetAI.cpp
+++ b/src/server/game/AI/CoreAI/PetAI.cpp
@@ -181,8 +181,10 @@ void PetAI::UpdateAI(const uint32 diff)
                         spellUsed = true;
                     }
                 }
+
                 if (spellInfo->HasEffect(SPELL_EFFECT_JUMP_DEST))
-                       continue; //pets must jump only to target
+                    continue; // Pets must only jump to target
+
                 // No enemy, check friendly
                 if (!spellUsed)
                 {
@@ -266,6 +268,7 @@ void PetAI::UpdateAllies()
     //only pet and owner/not in group->ok
     if (m_AllySet.size() == 2 && !group)
         return;
+
     //owner is in group; group members filled in already (no raid -> subgroupcount = whole count)
     if (group && !group->isRaidGroup() && m_AllySet.size() == (group->GetMembersCount() + 2))
         return;
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
index 74f70f6bb4b..c31a9141e18 100644
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
@@ -422,6 +422,8 @@ bool AuctionHouseObject::RemoveAuction(AuctionEntry* auction, uint32 /*itemEntry
 
     // we need to delete the entry, it is not referenced any more
     delete auction;
+    auction = NULL;
+
     return wasInMap;
 }
 
@@ -474,8 +476,8 @@ void AuctionHouseObject::Update()
         auction->DeleteFromDB(trans);
         CharacterDatabase.CommitTransaction(trans);
 
-        RemoveAuction(auction, itemEntry);
         sAuctionMgr->RemoveAItem(auction->itemGUIDLow);
+        RemoveAuction(auction, itemEntry);
     }
     while (result->NextRow());
 }
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 5cc304223e6..596f0ebbc28 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -1661,7 +1661,7 @@ bool ObjectMgr::MoveCreData(uint32 guid, uint32 mapId, Position pos)
             Creature* creature = new Creature;
             if (!creature->LoadCreatureFromDB(guid, map))
             {
-                sLog->outError(LOG_FILTER_GENERAL, "AddCreature: cannot add creature entry %u to map", guid);
+                sLog->outError(LOG_FILTER_GENERAL, "MoveCreData: Cannot add creature guid %u to map", guid);
                 delete creature;
                 return false;
             }
@@ -1713,7 +1713,7 @@ uint32 ObjectMgr::AddCreData(uint32 entry, uint32 /*team*/, uint32 mapId, float
             Creature* creature = new Creature;
             if (!creature->LoadCreatureFromDB(guid, map))
             {
-                sLog->outError(LOG_FILTER_GENERAL, "AddCreature: cannot add creature entry %u to map", entry);
+                sLog->outError(LOG_FILTER_GENERAL, "AddCreature: Cannot add creature entry %u to map", entry);
                 delete creature;
                 return 0;
             }
@@ -1738,8 +1738,7 @@ void ObjectMgr::LoadGameobjects()
 
     if (!result)
     {
-        sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 gameobjects. DB table `gameobject` is empty.");
-
+        sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 gameobjects. DB table `gameobject` is empty.");
         return;
     }
 
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
index 488dbfc9159..4f45044d5f7 100644
--- a/src/server/game/Movement/MotionMaster.cpp
+++ b/src/server/game/Movement/MotionMaster.cpp
@@ -378,14 +378,14 @@ void MotionMaster::MoveJump(float x, float y, float z, float speedXY, float spee
     Mutate(new EffectMovementGenerator(id), MOTION_SLOT_CONTROLLED);
 }
 
-void MotionMaster::MoveFall(uint32 id/*=0*/)
+void MotionMaster::MoveFall(uint32 id /*=0*/)
 {
     // use larger distance for vmap height search than in most other cases
     float tz = _owner->GetMap()->GetHeight(_owner->GetPhaseMask(), _owner->GetPositionX(), _owner->GetPositionY(), _owner->GetPositionZ(), true, MAX_FALL_DISTANCE);
     if (tz <= INVALID_HEIGHT)
     {
         sLog->outDebug(LOG_FILTER_GENERAL, "MotionMaster::MoveFall: unable retrive a proper height at map %u (x: %f, y: %f, z: %f).",
-            _owner->GetMap()->GetId(), _owner->GetPositionX(), _owner->GetPositionX(), _owner->GetPositionZ());
+            _owner->GetMap()->GetId(), _owner->GetPositionX(), _owner->GetPositionY(), _owner->GetPositionZ());
         return;
     }
 
diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp
index 38da442ca5b..97ad1d5f651 100644
--- a/src/server/game/Scripting/ScriptLoader.cpp
+++ b/src/server/game/Scripting/ScriptLoader.cpp
@@ -314,6 +314,7 @@ void AddSC_boss_ayamiss();
 void AddSC_boss_ossirian();
 void AddSC_instance_ruins_of_ahnqiraj();
 void AddSC_boss_cthun();                     //Temple of ahn'qiraj
+void AddSC_boss_viscidus();
 void AddSC_boss_fankriss();
 void AddSC_boss_huhuran();
 void AddSC_bug_trio();
@@ -941,6 +942,7 @@ void AddKalimdorScripts()
     AddSC_boss_ossirian();
     AddSC_instance_ruins_of_ahnqiraj();
     AddSC_boss_cthun();                     //Temple of ahn'qiraj
+    AddSC_boss_viscidus();
     AddSC_boss_fankriss();
     AddSC_boss_huhuran();
     AddSC_bug_trio();
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index 51e6ced8d24..aa9477b1c42 100644
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -1379,10 +1379,11 @@ FormulaScript::FormulaScript(const char* name)
     ScriptRegistry<FormulaScript>::AddScript(this);
 }
 
-UnitScript::UnitScript(const char* name)
+UnitScript::UnitScript(const char* name, bool addToScripts)
     : ScriptObject(name)
 {
-    ScriptRegistry<UnitScript>::AddScript(this);
+    if (addToScripts)
+        ScriptRegistry<UnitScript>::AddScript(this);
 }
 
 WorldMapScript::WorldMapScript(const char* name, uint32 mapId)
@@ -1419,7 +1420,7 @@ ItemScript::ItemScript(const char* name)
 }
 
 CreatureScript::CreatureScript(const char* name)
-    : UnitScript(name)
+    : UnitScript(name, false)
 {
     ScriptRegistry<CreatureScript>::AddScript(this);
 }
@@ -1473,7 +1474,7 @@ ConditionScript::ConditionScript(const char* name)
 }
 
 VehicleScript::VehicleScript(const char* name)
-    : UnitScript(name)
+    : ScriptObject(name)
 {
     ScriptRegistry<VehicleScript>::AddScript(this);
 }
@@ -1497,7 +1498,7 @@ AchievementCriteriaScript::AchievementCriteriaScript(const char* name)
 }
 
 PlayerScript::PlayerScript(const char* name)
-    : UnitScript(name)
+    : UnitScript(name, false)
 {
     ScriptRegistry<PlayerScript>::AddScript(this);
 }
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index 17cc3844605..86cf321264e 100644
--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -395,7 +395,7 @@ class UnitScript : public ScriptObject
 {
     protected:
 
-        UnitScript(const char* name);
+        UnitScript(const char* name, bool addToScripts = true);
 
     public:
         // Called when DoT's Tick Damage is being Dealt
@@ -599,7 +599,7 @@ class ConditionScript : public ScriptObject
         virtual bool OnConditionCheck(Condition* /*condition*/, ConditionSourceInfo& /*sourceInfo*/) { return true; }
 };
 
-class VehicleScript : public UnitScript
+class VehicleScript : public ScriptObject
 {
     protected:
 
diff --git a/src/server/game/Tools/CharacterDatabaseCleaner.cpp b/src/server/game/Tools/CharacterDatabaseCleaner.cpp
index 198bce4a9fe..02ab1fde209 100644
--- a/src/server/game/Tools/CharacterDatabaseCleaner.cpp
+++ b/src/server/game/Tools/CharacterDatabaseCleaner.cpp
@@ -36,7 +36,7 @@ void CharacterDatabaseCleaner::CleanDatabase()
     uint32 oldMSTime = getMSTime();
 
     // check flags which clean ups are necessary
-    QueryResult result = CharacterDatabase.Query("SELECT value FROM worldstates WHERE entry = 20004");
+    QueryResult result = CharacterDatabase.PQuery("SELECT value FROM worldstates WHERE entry = %d", WS_CLEANING_FLAGS);
     if (!result)
         return;
 
@@ -61,12 +61,11 @@ void CharacterDatabaseCleaner::CleanDatabase()
     // NOTE: In order to have persistentFlags be set in worldstates for the next cleanup,
     // you need to define them at least once in worldstates.
     flags &= sWorld->getIntConfig(CONFIG_PERSISTENT_CHARACTER_CLEAN_FLAGS);
-    CharacterDatabase.DirectPExecute("UPDATE worldstates SET value = %u WHERE entry = 20004", flags);
+    CharacterDatabase.DirectPExecute("UPDATE worldstates SET value = %u WHERE entry = %d", flags, WS_CLEANING_FLAGS);
 
     sWorld->SetCleaningFlags(flags);
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Cleaned character database in %u ms", GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void CharacterDatabaseCleaner::CheckUnique(const char* column, const char* table, bool (*check)(uint32))
diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h
index 505ccd939c6..3158756cba5 100644
--- a/src/server/game/World/World.h
+++ b/src/server/game/World/World.h
@@ -487,11 +487,13 @@ enum RealmZone
 
 enum WorldStates
 {
-    WS_WEEKLY_QUEST_RESET_TIME  = 20002,                    // Next weekly reset time
-    WS_BG_DAILY_RESET_TIME      = 20003,                    // Next daily BG reset time
-    WS_MONTHLY_QUEST_RESET_TIME = 20004,                     // Next monthly reset time
-    WS_GUILD_DAILY_RESET_TIME   = 20006,                    // Next guild cap reset time
-    WS_GUILD_WEEKLY_RESET_TIME  = 20007,                    // Next guild week reset time
+    WS_WEEKLY_QUEST_RESET_TIME  = 20002,                     // Next weekly reset time
+    WS_BG_DAILY_RESET_TIME      = 20003,                     // Next daily BG reset time
+    WS_CLEANING_FLAGS           = 20004,                     // Cleaning Flags
+    WS_GUILD_DAILY_RESET_TIME   = 20006,                     // Next guild cap reset time
+    WS_MONTHLY_QUEST_RESET_TIME = 20007,                     // Next monthly reset time
+    // Cata specific custom worldstates
+    WS_GUILD_WEEKLY_RESET_TIME  = 20050,                     // Next guild week reset time
 };
 
 /// Storage class for commands issued for delayed execution
diff --git a/src/server/scripts/Commands/cs_account.cpp b/src/server/scripts/Commands/cs_account.cpp
index 9269bbb07ee..a57b06a8ab0 100644
--- a/src/server/scripts/Commands/cs_account.cpp
+++ b/src/server/scripts/Commands/cs_account.cpp
@@ -306,6 +306,9 @@ public:
         {
             handler->SendSysMessage(LANG_COMMAND_WRONGOLDPASSWORD);
             handler->SetSentErrorMessage(true);
+            sLog->outInfo(LOG_FILTER_CHARACTER, "Account: %u (IP: %s) Character:[%s] (GUID: %u) Tried to change password.",
+                handler->GetSession()->GetAccountId(), handler->GetSession()->GetRemoteAddress().c_str(),
+                handler->GetSession()->GetPlayer()->GetName().c_str(), handler->GetSession()->GetPlayer()->GetGUIDLow());
             return false;
         }
 
@@ -321,6 +324,9 @@ public:
         {
             case AOR_OK:
                 handler->SendSysMessage(LANG_COMMAND_PASSWORD);
+                sLog->outInfo(LOG_FILTER_CHARACTER, "Account: %u (IP: %s) Character:[%s] (GUID: %u) Changed Password.",
+                    handler->GetSession()->GetAccountId(), handler->GetSession()->GetRemoteAddress().c_str(),
+                    handler->GetSession()->GetPlayer()->GetName().c_str(), handler->GetSession()->GetPlayer()->GetGUIDLow());
                 break;
             case AOR_PASS_TOO_LONG:
                 handler->SendSysMessage(LANG_PASSWORD_TOO_LONG);
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
index 73fefe210df..4a08801c972 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
@@ -32,10 +32,11 @@ enum Midnight
     SAY_MIDNIGHT_KILL           = 0,
     SAY_APPEAR                  = 1,
     SAY_MOUNT                   = 2,
-    SAY_KILL                    = 3,
-    SAY_DISARMED                = 4,
-    SAY_DEATH                   = 5,
-    SAY_RANDOM                  = 6,
+
+    SAY_KILL                    = 0,
+    SAY_DISARMED                = 1,
+    SAY_DEATH                   = 2,
+    SAY_RANDOM                  = 3,
 
     SPELL_SHADOWCLEAVE          = 29832,
     SPELL_INTANGIBLE_PRESENCE   = 29833,
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
index 56d07a49dc4..2e70081fe87 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
@@ -27,9 +27,9 @@ enum Spells
 
 enum Yells
 {
-    SAY_AGGRO                                   = -1595045,
-    SAY_FAIL                                    = -1595046,
-    SAY_DEATH                                   = -1595047
+    SAY_AGGRO                                   = 0,
+    SAY_DEATH                                   = 1,
+    SAY_FAIL                                    = 2
 };
 
 class boss_infinite_corruptor : public CreatureScript
@@ -59,11 +59,12 @@ public:
 
         void EnterCombat(Unit* /*who*/)
         {
+            Talk(SAY_AGGRO);
             if (instance)
                 instance->SetData(DATA_INFINITE_EVENT, IN_PROGRESS);
         }
 
-        void UpdateAI(const uint32 /*diff*/)
+        void UpdateAI(uint32 const /*diff*/)
         {
             //Return since we have no target
             if (!UpdateVictim())
@@ -74,6 +75,7 @@ public:
 
         void JustDied(Unit* /*killer*/)
         {
+            Talk(SAY_DEATH);
             if (instance)
                 instance->SetData(DATA_INFINITE_EVENT, DONE);
         }
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
index 40d4d5d54b4..7dd395770db 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
@@ -29,7 +29,7 @@ EndScriptData */
 
 enum Yells
 {
-    EMOTE_TARGET               = -1509002
+    EMOTE_TARGET               = 0
 };
 
 class boss_buru : public CreatureScript
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
index 4abbf99d4ef..5f5b958fb9b 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
@@ -21,8 +21,8 @@
 
 enum Texts
 {
-    EMOTE_AGGRO             = -1509000,
-    EMOTE_MANA_FULL         = -1509001
+    EMOTE_AGGRO             = 0,
+    EMOTE_MANA_FULL         = 1
 };
 
 enum Spells
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
index da67f93f968..1ffd74eddf3 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
@@ -23,22 +23,22 @@
 enum Yells
 {
     // The time of our retribution is at hand! Let darkness reign in the hearts of our enemies! Sound: 8645 Emote: 35
-    SAY_ANDOROV_INTRO         = -1509003,   // Before for the first wave
-    SAY_ANDOROV_ATTACK        = -1509004,   // Beginning the event
-    SAY_ANDOROV_WAVE_1        = -1509001,   // When the first wave comes text: Kill first, ask questions later... Incoming! emote: 45 sound: 8653
-    SAY_WAVE3                 = -1509005,
-    SAY_WAVE4                 = -1509006,
-    SAY_WAVE5                 = -1509007,
-    SAY_WAVE6                 = -1509008,
-    SAY_WAVE7                 = -1509009,
-    SAY_INTRO                 = -1509010,
-    SAY_UNK1                  = -1509011,
-    SAY_UNK2                  = -1509012,
-    SAY_UNK3                  = -1509013,
-    SAY_DEATH                 = -1509014,
-    SAY_CHANGEAGGRO           = -1509015,
-    SAY_KILLS_ANDOROV         = -1509016,
-    SAY_COMPLETE_QUEST        = -1509017    // Yell when realm complete quest 8743 for world event
+    SAY_ANDOROV_INTRO         = 0,   // Before for the first wave
+    SAY_ANDOROV_ATTACK        = 1,   // Beginning the event
+
+    SAY_WAVE3                 = 0,
+    SAY_WAVE4                 = 1,
+    SAY_WAVE5                 = 2,
+    SAY_WAVE6                 = 3,
+    SAY_WAVE7                 = 4,
+    SAY_INTRO                 = 5,
+    SAY_UNK1                  = 6,
+    SAY_UNK2                  = 7,
+    SAY_UNK3                  = 8,
+    SAY_DEATH                 = 9,
+    SAY_CHANGEAGGRO           = 10,
+    SAY_KILLS_ANDOROV         = 11,
+    SAY_COMPLETE_QUEST        = 12    // Yell when realm complete quest 8743 for world event
     // Warriors, Captains, continue the fight! Sound: 8640
 };
 
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
index 1cb69689b67..c97f8a0495f 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
@@ -58,8 +58,6 @@ EndScriptData */
  * - the current phase is stored in the instance data to be easily shared between the eye and cthun.
  */
 
-#define PI                          3.14
-
 enum Phases
 {
     PHASE_NOT_STARTED                           = 0,
@@ -76,24 +74,6 @@ enum Phases
     PHASE_CTHUN_DONE                            = 6,
 };
 
-enum Creatures
-{
-    MOB_CTHUN_PORTAL                            = 15896,
-
-    // ***** Main Phase 1 ********
-    BOSS_EYE_OF_CTHUN                           = 15589,
-    MOB_CLAW_TENTACLE                           = 15725,
-    MOB_EYE_TENTACLE                            = 15726,
-    MOB_SMALL_PORTAL                            = 15904,
-
-    // ***** Main Phase 2 ********
-    MOB_BODY_OF_CTHUN                           = 15809,
-    MOB_GIANT_CLAW_TENTACLE                     = 15728,
-    MOB_GIANT_EYE_TENTACLE                      = 15334,
-    MOB_FLESH_TENTACLE                          = 15802,
-    MOB_GIANT_PORTAL                            = 15910,
-};
-
 enum Spells
 {
     // ***** Main Phase 1 ********
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
index d0e97bc36c8..0f575043da6 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
- * Copyright (C) 2006-2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -16,18 +15,274 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* ScriptData
-SDName: Boss_Viscidus
-SD%Complete: 0
-SDComment: place holder
-SDCategory: Temple of Ahn'Qiraj
-EndScriptData */
-
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
+#include "SpellInfo.h"
+#include "temple_of_ahnqiraj.h"
+
+enum Spells
+{
+    SPELL_POISON_SHOCK          = 25993,
+    SPELL_POISONBOLT_VOLLEY     = 25991,
+    SPELL_TOXIN                 = 26575,
+    SPELL_VISCIDUS_SLOWED       = 26034,
+    SPELL_VISCIDUS_SLOWED_MORE  = 26036,
+    SPELL_VISCIDUS_FREEZE       = 25937,
+    SPELL_REJOIN_VISCIDUS       = 25896,
+    SPELL_VISCIDUS_EXPLODE      = 25938,
+    SPELL_VISCIDUS_SUICIDE      = 26003,
+
+    SPELL_MEMBRANE_VISCIDUS     = 25994,                   // damage reduction spell - removed from DBC
+    SPELL_VISCIDUS_WEAKNESS     = 25926,                   // aura which procs at damage - should trigger the slow spells - removed from DBC
+    SPELL_VISCIDUS_SHRINKS      = 25893,                   // (6) Apply Aura #61: Mod Scale Value: -4 - removed from DBC
+    SPELL_VISCIDUS_GROWS        = 25897,                   // removed from DBC
+    SPELL_SUMMON_GLOBS          = 25885,                   // summons npc 15667 using spells from 25865 to 25884; All spells have target coords - removed from DBC
+    SPELL_VISCIDUS_TELEPORT     = 25904,                   // removed from DBC
+};
+
+enum Events
+{
+    EVENT_POISONBOLT_VOLLEY     = 1,
+    EVENT_POISON_SHOCK          = 2,
+    EVENT_RESET_PHASE           = 3
+};
+
+enum Phases
+{
+    PHASE_FROST                 = 1,
+    PHASE_MELEE                 = 2,
+    PHASE_GLOB                  = 3
+};
+
+enum HitCounter
+{
+    HITCOUNTER_SLOW             = 100,  // "Viscidus begins to slow."
+    HITCOUNTER_SLOW_MORE        = 150,  // "Viscidus begins to freeze."
+    HITCOUNTER_FREEZE           = 200,  // "Viscidus is frozen solid."
+
+    // 4.3.4 data
+    HITCOUNTER_CRACK            = 50,   // "Viscidus begins to crack."
+    HITCOUNTER_SHATTER          = 100,  // "Viscidus looks ready to shatter."
+    HITCOUNTER_EXPLODE          = 150,  // "Viscidus explodes."
+
+    // 1.12 data
+    // HITCOUNTER_EXPLODE          = 75
+};
+
+enum MovePoints
+{
+    ROOM_CENTER                 = 1
+};
+
+Position const ViscidusCoord = { -7992.36f, 908.19f, -52.62f, 1.68f }; // TODO: Visci ain't room middle
+float const RoomRadius = 40.0f; // TODO: Not sure if its correct
+
+class boss_viscidus : public CreatureScript
+{
+    public:
+        boss_viscidus() : CreatureScript("boss_viscidus") { }
+
+        struct boss_viscidusAI : public BossAI
+        {
+            boss_viscidusAI(Creature* creature) : BossAI(creature, DATA_VISCIDUS) { }
+
+            void Reset()
+            {
+                _Reset();
+                _hitcounter = 0;
+                _phase = PHASE_FROST;
+            }
+
+            void DamageTaken(Unit* attacker, uint32& /*damage*/)
+            {
+                if (_phase != PHASE_MELEE)
+                    return;
+
+                ++_hitcounter;
+
+                if (attacker->HasUnitState(UNIT_STATE_MELEE_ATTACKING) && _hitcounter >= HITCOUNTER_EXPLODE)
+                {
+                    events.Reset();
+                    _phase = PHASE_GLOB;
+                    DoCast(me, SPELL_VISCIDUS_EXPLODE);
+                    me->SetVisible(false);
+                    me->RemoveAura(SPELL_TOXIN);
+                    me->RemoveAura(SPELL_VISCIDUS_FREEZE);
+
+                    uint8 NumGlobes = me->GetHealthPct() / 5.0f;
+                    for (uint8 i = 0; i < NumGlobes; ++i)
+                    {
+                        float Angle = i * 2 * M_PI / NumGlobes;
+                        float X = ViscidusCoord.GetPositionX() + std::cos(Angle) * RoomRadius;
+                        float Y = ViscidusCoord.GetPositionY() + std::sin(Angle) * RoomRadius;
+                        float Z = -35.0f;
+
+                        if (TempSummon* Glob = me->SummonCreature(NPC_GLOB_OF_VISCIDUS, X, Y, Z))
+                        {
+                            Glob->UpdateAllowedPositionZ(X, Y, Z);
+                            Glob->NearTeleportTo(X, Y, Z, 0.0f);
+                            Glob->GetMotionMaster()->MovePoint(ROOM_CENTER, ViscidusCoord);
+                        }
+                    }
+                }
+            }
+
+            void SpellHit(Unit* /*caster*/, SpellInfo const* spell)
+            {
+                if ((spell->GetSchoolMask() & SPELL_SCHOOL_MASK_FROST) && _phase == PHASE_FROST && me->GetHealthPct() > 5.0f)
+                {
+                    ++_hitcounter;
+
+                    if (_hitcounter >= HITCOUNTER_FREEZE)
+                    {
+                        _phase = PHASE_MELEE;
+                        DoCast(me, SPELL_VISCIDUS_FREEZE);
+                        me->RemoveAura(SPELL_VISCIDUS_SLOWED_MORE);
+                        events.ScheduleEvent(EVENT_RESET_PHASE, 15000);
+                    }
+                    else if (_hitcounter >= HITCOUNTER_SLOW_MORE)
+                    {
+                        me->RemoveAura(SPELL_VISCIDUS_SLOWED);
+                        DoCast(me, SPELL_VISCIDUS_SLOWED_MORE);
+                    }
+                    else if (_hitcounter >= HITCOUNTER_SLOW)
+                        DoCast(me, SPELL_VISCIDUS_SLOWED);
+                }
+            }
+
+            void EnterCombat(Unit* /*who*/)
+            {
+                _EnterCombat();
+                events.Reset();
+                InitSpells();
+            }
+
+            void InitSpells()
+            {
+                DoCast(me, SPELL_TOXIN);
+                events.ScheduleEvent(EVENT_POISONBOLT_VOLLEY, urand(10000, 15000));
+                events.ScheduleEvent(EVENT_POISON_SHOCK, urand(7000, 12000));
+            }
+
+            void EnterEvadeMode()
+            {
+                summons.DespawnAll();
+                ScriptedAI::EnterEvadeMode();
+            }
+
+            void JustDied(Unit* /*killer*/)
+            {
+                DoCast(me, SPELL_VISCIDUS_SUICIDE);
+                summons.DespawnAll();
+            }
+
+            void UpdateAI(uint32 const diff)
+            {
+                if (!UpdateVictim())
+                    return;
+
+                if (_phase == PHASE_GLOB && summons.empty())
+                {
+                    me->NearTeleportTo(ViscidusCoord.GetPositionX(),
+                        ViscidusCoord.GetPositionY(),
+                        ViscidusCoord.GetPositionZ(),
+                        ViscidusCoord.GetOrientation());
+
+                    _hitcounter = 0;
+                    _phase = PHASE_FROST;
+                    InitSpells();
+                    me->SetVisible(true);
+                }
+
+                events.Update(diff);
+
+                while (uint32 eventId = events.ExecuteEvent())
+                {
+                    switch (eventId)
+                    {
+                        case EVENT_POISONBOLT_VOLLEY:
+                            DoCast(me, SPELL_POISONBOLT_VOLLEY);
+                            events.ScheduleEvent(EVENT_POISONBOLT_VOLLEY, urand(10000, 15000));
+                            break;
+                        case EVENT_POISON_SHOCK:
+                            DoCast(me, SPELL_POISON_SHOCK);
+                            events.ScheduleEvent(EVENT_POISON_SHOCK, urand(7000, 12000));
+                            break;
+                        case EVENT_RESET_PHASE:
+                            _hitcounter = 0;
+                            _phase = PHASE_FROST;
+                            break;
+                        default:
+                            break;
+                    }
+                }
+
+                if (_phase != PHASE_GLOB)
+                    DoMeleeAttackIfReady();
+            }
+
+        private:
+            uint8 _hitcounter;
+            Phases _phase;
+        };
+
+        CreatureAI* GetAI(Creature* creature) const
+        {
+            return new boss_viscidusAI(creature);
+        }
+};
+
+class npc_glob_of_viscidus : public CreatureScript
+{
+    public:
+        npc_glob_of_viscidus() : CreatureScript("boss_glob_of_viscidus") { }
+
+        struct npc_glob_of_viscidusAI : public ScriptedAI
+        {
+            npc_glob_of_viscidusAI(Creature* creature) : ScriptedAI(creature) { }
+
+            void JustDied(Unit* /*killer*/)
+            {
+                InstanceScript* Instance = me->GetInstanceScript();
+                if (!Instance)
+                    return;
+
+                if (Creature* Viscidus = me->GetMap()->GetCreature(Instance->GetData64(DATA_VISCIDUS)))
+                {
+                    if (BossAI* ViscidusAI = dynamic_cast<BossAI*>(Viscidus->GetAI()))
+                        ViscidusAI->SummonedCreatureDespawn(me);
+
+                    if (Viscidus->isAlive() && Viscidus->GetHealthPct() < 5.0f)
+                    {
+                        Viscidus->SetVisible(true);
+                        Viscidus->getVictim()->Kill(Viscidus);
+                    }
+                    else
+                    {
+                        Viscidus->SetHealth(Viscidus->GetHealth() - Viscidus->GetMaxHealth() / 20);
+                        Viscidus->SetObjectScale(Viscidus->GetFloatValue(OBJECT_FIELD_SCALE_X) - 0.05f); // TODO: Not sure if blizzlike
+                    }
+                }
+            }
 
-#define SPELL_POISON_SHOCK          25993
-#define SPELL_POISONBOLT_VOLLEY     25991
+            void MovementInform(uint32 /*type*/, uint32 id)
+            {
+                if (id == ROOM_CENTER)
+                {
+                    DoCast(me, SPELL_REJOIN_VISCIDUS);
+                    ((TempSummon*)me)->UnSummon();
+                }
+            }
+        };
 
-#define SPELL_TOXIN_CLOUD           25989
+        CreatureAI* GetAI(Creature* creature) const
+        {
+            return new npc_glob_of_viscidusAI(creature);
+        }
+};
 
+void AddSC_boss_viscidus()
+{
+    new boss_viscidus();
+    new npc_glob_of_viscidus();
+}
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
index c8a1ff63925..3efdcd0dcf6 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
@@ -29,71 +29,86 @@ EndScriptData */
 
 class instance_temple_of_ahnqiraj : public InstanceMapScript
 {
-public:
-    instance_temple_of_ahnqiraj() : InstanceMapScript("instance_temple_of_ahnqiraj", 531) { }
+    public:
+        instance_temple_of_ahnqiraj() : InstanceMapScript("instance_temple_of_ahnqiraj", 531) { }
 
-    InstanceScript* GetInstanceScript(InstanceMap* map) const
-    {
-        return new instance_temple_of_ahnqiraj_InstanceMapScript(map);
-    }
+        InstanceScript* GetInstanceScript(InstanceMap* map) const
+        {
+            return new instance_temple_of_ahnqiraj_InstanceMapScript(map);
+        }
 
-    struct instance_temple_of_ahnqiraj_InstanceMapScript : public InstanceScript
-    {
-        instance_temple_of_ahnqiraj_InstanceMapScript(Map* map) : InstanceScript(map) {}
+        struct instance_temple_of_ahnqiraj_InstanceMapScript : public InstanceScript
+        {
+            instance_temple_of_ahnqiraj_InstanceMapScript(Map* map) : InstanceScript(map) {}
 
-        //If Vem is dead...
-        bool IsBossDied[3];
+            //If Vem is dead...
+            bool IsBossDied[3];
 
-        //Storing Skeram, Vem and Kri.
-        uint64 SkeramGUID;
-        uint64 VemGUID;
-        uint64 KriGUID;
-        uint64 VeklorGUID;
-        uint64 VeknilashGUID;
+            //Storing Skeram, Vem and Kri.
+            uint64 SkeramGUID;
+            uint64 VemGUID;
+            uint64 KriGUID;
+            uint64 VeklorGUID;
+            uint64 VeknilashGUID;
+            uint64 ViscidusGUID;
 
-        uint32 BugTrioDeathCount;
+            uint32 BugTrioDeathCount;
 
-        uint32 CthunPhase;
+            uint32 CthunPhase;
 
-        void Initialize()
-        {
-            IsBossDied[0] = false;
-            IsBossDied[1] = false;
-            IsBossDied[2] = false;
+            void Initialize()
+            {
+                IsBossDied[0] = false;
+                IsBossDied[1] = false;
+                IsBossDied[2] = false;
 
-            SkeramGUID = 0;
-            VemGUID = 0;
-            KriGUID = 0;
-            VeklorGUID = 0;
-            VeknilashGUID = 0;
+                SkeramGUID = 0;
+                VemGUID = 0;
+                KriGUID = 0;
+                VeklorGUID = 0;
+                VeknilashGUID = 0;
+                ViscidusGUID = 0;
 
-            BugTrioDeathCount = 0;
+                BugTrioDeathCount = 0;
 
-            CthunPhase = 0;
-        }
+                CthunPhase = 0;
+            }
 
-        void OnCreatureCreate(Creature* creature)
-        {
-            switch (creature->GetEntry())
+            void OnCreatureCreate(Creature* creature)
             {
-                case 15263: SkeramGUID = creature->GetGUID(); break;
-                case 15544: VemGUID = creature->GetGUID(); break;
-                case 15511: KriGUID = creature->GetGUID(); break;
-                case 15276: VeklorGUID = creature->GetGUID(); break;
-                case 15275: VeknilashGUID = creature->GetGUID(); break;
+                switch (creature->GetEntry())
+                {
+                case NPC_SKERAM:
+                    SkeramGUID = creature->GetGUID();
+                    break;
+                case NPC_VEM:
+                    VemGUID = creature->GetGUID();
+                    break;
+                case NPC_KRI:
+                    KriGUID = creature->GetGUID();
+                    break;
+                case NPC_VEKLOR:
+                    VeklorGUID = creature->GetGUID();
+                    break;
+                case NPC_VEKNILASH:
+                    VeknilashGUID = creature->GetGUID();
+                    break;
+                case NPC_VISCIDUS:
+                    ViscidusGUID = creature->GetGUID();
+                    break;
+                }
             }
-        }
 
-        bool IsEncounterInProgress() const
-        {
-            //not active in AQ40
-            return false;
-        }
+            bool IsEncounterInProgress() const
+            {
+                //not active in AQ40
+                return false;
+            }
 
-        uint32 GetData(uint32 type) const
-        {
-            switch (type)
+            uint32 GetData(uint32 type) const
             {
+                switch (type)
+                {
                 case DATA_VEMISDEAD:
                     if (IsBossDied[0])
                         return 1;
@@ -114,14 +129,14 @@ public:
 
                 case DATA_CTHUN_PHASE:
                     return CthunPhase;
+                }
+                return 0;
             }
-            return 0;
-        }
 
-        uint64 GetData64(uint32 identifier) const
-        {
-            switch (identifier)
+            uint64 GetData64(uint32 identifier) const
             {
+                switch (identifier)
+                {
                 case DATA_SKERAM:
                     return SkeramGUID;
                 case DATA_VEM:
@@ -132,14 +147,16 @@ public:
                     return VeklorGUID;
                 case DATA_VEKNILASH:
                     return VeknilashGUID;
-            }
-            return 0;
-        }                                                       // end GetData64
+                case DATA_VISCIDUS:
+                    return ViscidusGUID;
+                }
+                return 0;
+            }                                                       // end GetData64
 
-        void SetData(uint32 type, uint32 data)
-        {
-            switch (type)
+            void SetData(uint32 type, uint32 data)
             {
+                switch (type)
+                {
                 case DATA_VEM_DEATH:
                     IsBossDied[0] = true;
                     break;
@@ -159,9 +176,9 @@ public:
                 case DATA_CTHUN_PHASE:
                     CthunPhase = data;
                     break;
+                }
             }
-        }
-    };
+        };
 
 };
 
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
index 13c3d56d14c..f154ccf2c5d 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
@@ -19,19 +19,45 @@
 #ifndef DEF_TEMPLE_OF_AHNQIRAJ_H
 #define DEF_TEMPLE_OF_AHNQIRAJ_H
 
-#define DATA_SKERAM              1
-#define DATA_KRI                 2
-#define DATA_VEM                 3
-#define DATA_VEMISDEAD           4
-#define DATA_VEM_DEATH           5
-#define DATA_VEKLOR              6
-#define DATA_VEKLORISDEAD        7
-#define DATA_VEKLOR_DEATH        8
-#define DATA_VEKNILASH           9
-#define DATA_VEKNILASHISDEAD    10
-#define DATA_VEKNILASH_DEATH    11
-#define DATA_BUG_TRIO_DEATH     14
+enum DataTypes
+{
+    DATA_SKERAM             = 1,
+    DATA_KRI                = 2,
+    DATA_VEM                = 3,
+    DATA_VEMISDEAD          = 4,
+    DATA_VEM_DEATH          = 5,
+    DATA_VEKLOR             = 6,
+    DATA_VEKLORISDEAD       = 7,
+    DATA_VEKLOR_DEATH       = 8,
+    DATA_VEKNILASH          = 9,
+    DATA_VEKNILASHISDEAD    = 10,
+    DATA_VEKNILASH_DEATH    = 11,
+    DATA_BUG_TRIO_DEATH     = 14,
+    DATA_CTHUN_PHASE        = 20,
+    DATA_VISCIDUS           = 21
+};
 
-#define DATA_CTHUN_PHASE        20
+enum Creatures
+{
+    BOSS_EYE_OF_CTHUN       = 15589,
+    MOB_CTHUN_PORTAL        = 15896,
+    MOB_CLAW_TENTACLE       = 15725,
+    MOB_EYE_TENTACLE        = 15726,
+    MOB_SMALL_PORTAL        = 15904,
+    MOB_BODY_OF_CTHUN       = 15809,
+    MOB_GIANT_CLAW_TENTACLE = 15728,
+    MOB_GIANT_EYE_TENTACLE  = 15334,
+    MOB_FLESH_TENTACLE      = 15802,
+    MOB_GIANT_PORTAL        = 15910,
+
+    NPC_VISCIDUS            = 15299,
+    NPC_GLOB_OF_VISCIDUS    = 15667,
+
+    NPC_SKERAM              = 15263,
+    NPC_VEM                 = 15544,
+    NPC_KRI                 = 15511,
+    NPC_VEKLOR              = 15276,
+    NPC_VEKNILASH           = 15275
+};
 #endif
 
diff --git a/src/server/scripts/Kalimdor/moonglade.cpp b/src/server/scripts/Kalimdor/moonglade.cpp
index f0a1a61a5fd..bea556bdfa6 100644
--- a/src/server/scripts/Kalimdor/moonglade.cpp
+++ b/src/server/scripts/Kalimdor/moonglade.cpp
@@ -33,6 +33,9 @@ EndContentData */
 #include "ScriptedGossip.h"
 #include "Player.h"
 #include "SpellInfo.h"
+#include "Cell.h"
+#include "CellImpl.h"
+#include "GridNotifiers.h"
 
 /*######
 ## npc_bunthen_plainswind
@@ -315,6 +318,28 @@ public:
             }
         }
 
+        void IsSummonedBy(Unit* /*summoner*/)
+        {            
+            std::list<Player*> playerOnQuestList;
+            Trinity::AnyPlayerInObjectRangeCheck checker(me, 5.0f);
+            Trinity::PlayerListSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(me, playerOnQuestList, checker);
+            me->VisitNearbyWorldObject(5.0f, searcher);
+            for (std::list<Player*>::const_iterator itr = playerOnQuestList.begin(); itr != playerOnQuestList.end(); ++itr)
+            {
+                // Check if found player target has active quest
+                if (Player* player = (*itr))
+                {
+                    if (player->GetQuestStatus(10965) == QUEST_STATUS_INCOMPLETE)
+                    {
+                        StartEvent(player);
+                        break;
+                    }
+                }
+                else
+                    break;
+            }
+        }
+
         void JustDied(Unit* /*killer*/)
         {
             if (!PlayerGUID)
@@ -354,7 +379,7 @@ public:
             return;
         }
 
-        void UpdateAI(const uint32 diff)
+        void UpdateAI(uint32 const diff)
         {
             npc_escortAI::UpdateAI(diff);
 
@@ -529,30 +554,6 @@ public:
 };
 
 /*####
-# npc_clintar_dreamwalker
-####*/
-
-enum Clintar
-{
-    CLINTAR_SPIRIT      = 22916
-};
-
-class npc_clintar_dreamwalker : public CreatureScript
-{
-public:
-    npc_clintar_dreamwalker() : CreatureScript("npc_clintar_dreamwalker") { }
-
-    bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest)
-    {
-        if (quest->GetQuestId() == 10965)
-            if (Creature* clintar_spirit = creature->SummonCreature(CLINTAR_SPIRIT, ClintarSpiritSummon, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 100000))
-                CAST_AI(npc_clintar_spirit::npc_clintar_spiritAI, clintar_spirit->AI())->StartEvent(player);
-        return true;
-    }
-
-};
-
-/*####
 # npc_omen
 ####*/
 
@@ -700,6 +701,10 @@ public:
 
 void AddSC_moonglade()
 {
+    new npc_bunthen_plainswind();
+    new npc_great_bear_spirit();
+    new npc_silva_filnaveth();
+    new npc_clintar_spirit();
     new npc_omen();
     new npc_giant_spotlight();
 }
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
index 7fa476100d5..5617c69aea9 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
@@ -53,14 +53,16 @@ enum eUnits
     ENTRY_REINFORCED_FEL_IRON_CHEST_H = 185169
 };
 
-enum eSays
+enum Says
 {
     SAY_INTRO                     = 0,
-    SAY_WIPE                      = 1,
-    SAY_AGGRO                     = 2,
-    SAY_KILL                      = 3,
-    SAY_DIE                       = 4,
-    EMOTE                         = 5
+
+    SAY_WIPE                      = 0,
+    SAY_AGGRO                     = 1,
+    SAY_KILL                      = 2,
+    SAY_DIE                       = 3,
+
+    EMOTE                         = 0
 };
 
 const float VazrudenMiddle[3] = {-1406.5f, 1746.5f, 81.2f};
diff --git a/src/server/scripts/Spells/spell_holiday.cpp b/src/server/scripts/Spells/spell_holiday.cpp
index 4f48c311612..40cef99048f 100644
--- a/src/server/scripts/Spells/spell_holiday.cpp
+++ b/src/server/scripts/Spells/spell_holiday.cpp
@@ -274,6 +274,69 @@ class spell_hallow_end_tricky_treat : public SpellScriptLoader
         }
 };
 
+enum Mistletoe
+{
+    SPELL_CREATE_MISTLETOE          = 26206,
+    SPELL_CREATE_HOLLY              = 26207,
+    SPELL_CREATE_SNOWFLAKES         = 45036
+};
+
+class spell_winter_veil_mistletoe : public SpellScriptLoader
+{
+    public:
+        spell_winter_veil_mistletoe() : SpellScriptLoader("spell_winter_veil_mistletoe") { }
+
+        class spell_winter_veil_mistletoe_SpellScript : public SpellScript
+        {
+            PrepareSpellScript(spell_winter_veil_mistletoe_SpellScript);
+
+            bool Validate(SpellInfo const* /*spell*/)
+            {
+                if (!sSpellMgr->GetSpellInfo(SPELL_CREATE_MISTLETOE) ||
+                    !sSpellMgr->GetSpellInfo(SPELL_CREATE_HOLLY) ||
+                    !sSpellMgr->GetSpellInfo(SPELL_CREATE_SNOWFLAKES))
+                    return false;
+                return true;
+            }
+
+            void HandleScript(SpellEffIndex /*effIndex*/)
+            {
+                Unit* caster = GetCaster();
+
+                if (Player* target = GetHitPlayer())
+                {
+                    uint32 spellId = 0;
+                    switch (urand(0, 2))
+                    {
+                        case 0:
+                            spellId = SPELL_CREATE_MISTLETOE;
+                            break;
+                        case 1:
+                            spellId = SPELL_CREATE_HOLLY;
+                            break;
+                        case 2:
+                            spellId = SPELL_CREATE_SNOWFLAKES;
+                            break;
+                        default:
+                            return;
+                    }
+
+                    caster->CastSpell(target, spellId, true);
+                }
+            }
+
+            void Register()
+            {
+                OnEffectHitTarget += SpellEffectFn(spell_winter_veil_mistletoe_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
+            }
+        };
+
+        SpellScript* GetSpellScript() const
+        {
+            return new spell_winter_veil_mistletoe_SpellScript();
+        }
+};
+
 void AddSC_holiday_spell_scripts()
 {
     // Love is in the Air
@@ -282,4 +345,6 @@ void AddSC_holiday_spell_scripts()
     new spell_hallow_end_trick();
     new spell_hallow_end_trick_or_treat();
     new spell_hallow_end_tricky_treat();
+    // Winter Veil
+    new spell_winter_veil_mistletoe();
 }
diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp
index da80ec8f1da..58b6fca8a81 100644
--- a/src/server/scripts/Spells/spell_quest.cpp
+++ b/src/server/scripts/Spells/spell_quest.cpp
@@ -1432,7 +1432,7 @@ class spell_q11010_q11102_q11023_choose_loc : public SpellScriptLoader
                 Unit* caster = GetCaster();
                 // Check for player that is in 65 y range
                 std::list<Player*> playerList;
-                Trinity::AnyPlayerInObjectRangeCheck checker(caster, 765.0f);
+                Trinity::AnyPlayerInObjectRangeCheck checker(caster, 65.0f);
                 Trinity::PlayerListSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(caster, playerList, checker);
                 caster->VisitNearbyWorldObject(65.0f, searcher);
                     for (std::list<Player*>::const_iterator itr = playerList.begin(); itr != playerList.end(); ++itr)
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index 936052fd8ad..ebd56c2afe4 100644
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -1586,49 +1586,6 @@ public:
     }
 };
 
-/*####
-## npc_winter_reveler
-####*/
-
-enum WinterReveler
-{
-    SPELL_MISTLETOE_DEBUFF       = 26218,
-    SPELL_CREATE_MISTLETOE       = 26206,
-    SPELL_CREATE_HOLLY           = 26207,
-    SPELL_CREATE_SNOWFLAKES      = 45036,
-};
-
-class npc_winter_reveler : public CreatureScript
-{
-    public:
-        npc_winter_reveler() : CreatureScript("npc_winter_reveler") { }
-
-        struct npc_winter_revelerAI : public ScriptedAI
-        {
-            npc_winter_revelerAI(Creature* creature) : ScriptedAI(creature) {}
-
-            void ReceiveEmote(Player* player, uint32 emote)
-            {
-                if (player->HasAura(SPELL_MISTLETOE_DEBUFF))
-                    return;
-
-                if (!IsHolidayActive(HOLIDAY_FEAST_OF_WINTER_VEIL))
-                    return;
-
-                if (emote == TEXT_EMOTE_KISS)
-                {
-                    uint32 spellId = RAND<uint32>(SPELL_CREATE_MISTLETOE, SPELL_CREATE_HOLLY, SPELL_CREATE_SNOWFLAKES);
-                    me->CastSpell(player, spellId, false);
-                    me->CastSpell(player, SPELL_MISTLETOE_DEBUFF, false);
-                }
-            }
-        };
-
-        CreatureAI* GetAI(Creature* creature) const
-        {
-            return new npc_winter_revelerAI(creature);
-        }
-};
 
 /*####
 ## npc_snake_trap_serpents
@@ -3039,7 +2996,6 @@ void AddSC_npcs_special()
     new npc_sayge();
     new npc_steam_tonk();
     new npc_tonk_mine();
-    new npc_winter_reveler();
     new npc_brewfest_reveler();
     new npc_snake_trap();
     new npc_mirror_image();