Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

5 files changed, 17 insertions, 2 deletions

diff --git a/sql/updates/world/2014_05_03_00_world_creature_template.sql b/sql/updates/world/2014_05_03_00_world_creature_template.sql
new file mode 100644
index 00000000000..c17c1cf07cd
--- /dev/null
+++ b/sql/updates/world/2014_05_03_00_world_creature_template.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature_template` SET `flags_extra`=0 WHERE `entry` IN (25342,25343);
diff --git a/sql/updates/world/2014_05_03_01_world_gossip_menu_option.sql b/sql/updates/world/2014_05_03_01_world_gossip_menu_option.sql
new file mode 100644
index 00000000000..2120623365e
--- /dev/null
+++ b/sql/updates/world/2014_05_03_01_world_gossip_menu_option.sql
@@ -0,0 +1,11 @@
+UPDATE `gossip_menu_option` SET `option_id`=3,`npc_option_npcflag`=128 WHERE `menu_id`=11104 AND `id`=0;
+UPDATE `gossip_menu_option` SET `option_id`=4,`npc_option_npcflag`=8192 WHERE `menu_id`=9683 AND `id`=0;
+UPDATE `gossip_menu_option` SET `option_id`=5,`npc_option_npcflag`=16 WHERE `menu_id`=3626 AND `id`=0;
+UPDATE `gossip_menu_option` SET `option_id`=12,`npc_option_npcflag`=1048576 WHERE `menu_id`=10601 AND `id`=0;
+UPDATE `gossip_menu_option` SET `option_id`=15,`npc_option_npcflag`=4096 WHERE `menu_id`=9848 AND `id`=0;
+UPDATE `gossip_menu_option` SET `option_id`=1,`npc_option_npcflag`=1 WHERE `menu_id` IN (10211,11398,11016,11014,10949,10948,10860,10614,9280,9297,9418,9492,9669,9928,10012,10200,10204,10206,10366,10477) AND `id`=0;
+UPDATE `gossip_menu_option` SET `option_id`=1,`npc_option_npcflag`=1 WHERE `menu_id` IN (11016,10204,9297,10464,10465,10316,10949) AND `id`=1;
+UPDATE `gossip_menu_option` SET `option_id`=1,`npc_option_npcflag`=1 WHERE `menu_id` IN (10614,11014,11016) AND `id`=3;
+UPDATE `gossip_menu_option` SET `option_id`=1,`npc_option_npcflag`=1 WHERE `menu_id`=11014 AND `id`=4;
+UPDATE `gossip_menu_option` SET `option_id`=1,`npc_option_npcflag`=1 WHERE `menu_id` IN (11014,11016) AND `id`=5;
+UPDATE `gossip_menu_option` SET `option_id`=1,`npc_option_npcflag`=1 WHERE `menu_id`=10318 AND `id`=7;
diff --git a/src/server/authserver/Authentication/AuthCodes.cpp b/src/server/authserver/Authentication/AuthCodes.cpp
index 1bf5dcad51f..bb278dd6653 100644
--- a/src/server/authserver/Authentication/AuthCodes.cpp
+++ b/src/server/authserver/Authentication/AuthCodes.cpp
@@ -25,6 +25,7 @@ namespace AuthHelper
         {15595, 4, 3, 4, ' '},
         {14545, 4, 2, 2, ' '},
         {13623, 4, 0, 6, 'a'},
+        {13930, 3, 3, 5, 'a'},                                  // 3.3.5a China Mainland build
         {12340, 3, 3, 5, 'a'},
         {11723, 3, 3, 3, 'a'},
         {11403, 3, 3, 2, ' '},
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index 8c086d52a9c..51eb0df473e 100644
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -413,7 +413,8 @@ struct AreaTriggerStruct
 
 struct BroadcastText
 {
-    BroadcastText()
+    BroadcastText() : Id(0), Language(0), EmoteId0(0), EmoteId1(0), EmoteId2(0),
+                      EmoteDelay0(0), EmoteDelay1(0), EmoteDelay2(0), SoundId(0), Unk1(0), Unk2(0)
     {
         MaleText.resize(DEFAULT_LOCALE + 1);
         FemaleText.resize(DEFAULT_LOCALE + 1);
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 8f368599258..c764ab0237d 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -824,7 +824,7 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr
             if (EventProcFlag == PROC_FLAG_DONE_PERIODIC)
             {
                 /// no aura with only PROC_FLAG_DONE_PERIODIC and spellFamilyName == 0 can proc from a HOT.
-                if (!spellProcEvent->spellFamilyName)
+                if (!spellProcEvent || !spellProcEvent->spellFamilyName)
                     return false;
             }
             /// Aura must have positive procflags for a HOT to proc