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

6 files changed, 91 insertions, 8 deletions

diff --git a/sql/updates/world/2014_10_05_05_world.sql b/sql/updates/world/2014_10_05_05_world.sql
new file mode 100644
index 00000000000..35775eaac70
--- /dev/null
+++ b/sql/updates/world/2014_10_05_05_world.sql
@@ -0,0 +1,38 @@
+--
+UPDATE `npc_text` SET `BroadcastTextID0`=5793 WHERE `ID`=3464;
+UPDATE `npc_text` SET `BroadcastTextID0`=10046 WHERE `ID`=7339;
+UPDATE `npc_text` SET `BroadcastTextID0`=10048 WHERE `ID`=7340;
+UPDATE `npc_text` SET `BroadcastTextID0`=10053 WHERE `ID`=7341;
+UPDATE `npc_text` SET `BroadcastTextID0`=10062 WHERE `ID`=7355;
+UPDATE `npc_text` SET `BroadcastTextID0`=10065 WHERE `ID`=7356;
+UPDATE `npc_text` SET `BroadcastTextID0`=10082 WHERE `ID`=7362;
+UPDATE `npc_text` SET `BroadcastTextID0`=10086 WHERE `ID`=7363;
+UPDATE `npc_text` SET `BroadcastTextID0`=10092 WHERE `ID`=7365;
+UPDATE `npc_text` SET `BroadcastTextID0`=10210 WHERE `ID`=7437;
+UPDATE `npc_text` SET `BroadcastTextID0`=10366 WHERE `ID`=7484;
+UPDATE `npc_text` SET `BroadcastTextID0`=10412 WHERE `ID`=7498;
+UPDATE `npc_text` SET `BroadcastTextID0`=10417 WHERE `ID`=7500;
+UPDATE `npc_text` SET `BroadcastTextID0`=10419 WHERE `ID`=7501;
+UPDATE `npc_text` SET `BroadcastTextID0`=10390 WHERE `ID`=7502;
+UPDATE `npc_text` SET `BroadcastTextID0`=10395 WHERE `ID`=7505;
+UPDATE `npc_text` SET `BroadcastTextID0`=10404 WHERE `ID`=7508;
+UPDATE `npc_text` SET `BroadcastTextID0`=10406 WHERE `ID`=7509;
+UPDATE `npc_text` SET `BroadcastTextID0`=10466 WHERE `ID`=7596;
+UPDATE `npc_text` SET `BroadcastTextID0`=10468 WHERE `ID`=7597;
+UPDATE `npc_text` SET `BroadcastTextID0`=10470 WHERE `ID`=7598;
+UPDATE `npc_text` SET `BroadcastTextID0`=10475 WHERE `ID`=7614;
+UPDATE `npc_text` SET `BroadcastTextID0`=10493 WHERE `ID`=7641;
+UPDATE `npc_text` SET `BroadcastTextID0`=10543 WHERE `ID`=7674;
+UPDATE `npc_text` SET `BroadcastTextID0`=10547 WHERE `ID`=7676;
+UPDATE `npc_text` SET `BroadcastTextID0`=10548 WHERE `ID`=7677;
+UPDATE `npc_text` SET `BroadcastTextID0`=10557 WHERE `ID`=7683;
+UPDATE `npc_text` SET `BroadcastTextID0`=17814 WHERE `ID`=20201;
+UPDATE `npc_text` SET `BroadcastTextID0`=27613 WHERE `ID`=13100;
+UPDATE `npc_text` SET `BroadcastTextID0`=9499 WHERE `ID`=6938;
+UPDATE `npc_text` SET `BroadcastTextID0`=6016 WHERE `ID`=447;
+UPDATE `npc_text` SET `BroadcastTextID0`=20391 WHERE `ID`=10412;
+UPDATE `npc_text` SET `BroadcastTextID0`=19868 WHERE `ID`=10616;
+UPDATE `npc_text` SET `BroadcastTextID0`=14430 WHERE `ID`=9080;
+UPDATE `npc_text` SET `BroadcastTextID0`=10567 WHERE `ID`=7692;
+UPDATE `npc_text` SET `BroadcastTextID0`=6001 WHERE `ID`=3579;
+UPDATE `npc_text` SET `BroadcastTextID0`=5035 WHERE `ID`=2725;
diff --git a/sql/updates/world/2014_10_05_06_world.sql b/sql/updates/world/2014_10_05_06_world.sql
new file mode 100644
index 00000000000..fa28f871d64
--- /dev/null
+++ b/sql/updates/world/2014_10_05_06_world.sql
@@ -0,0 +1,6 @@
+--
+UPDATE `creature` SET `map`=571 WHERE `guid`=101828 AND `id`=25434;
+UPDATE `creature` SET `position_y`=-6381.79 WHERE `guid`=82822 AND `id`=16303;
+UPDATE `creature` SET `position_y`=-6395.32 WHERE `guid`=82826 AND `id`=16303;
+UPDATE `creature` SET `position_y`=-6343.51 WHERE `guid`=82827 AND `id`=16303;
+UPDATE `creature` SET `map`=1 WHERE `guid`=40251 AND `id`=29346;
diff --git a/sql/updates/world/2014_10_05_07_world.sql b/sql/updates/world/2014_10_05_07_world.sql
new file mode 100644
index 00000000000..4e2e84def5a
--- /dev/null
+++ b/sql/updates/world/2014_10_05_07_world.sql
@@ -0,0 +1,30 @@
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN(25285,31033);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN(25285,31033) AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` =2528500 AND `source_type`=9;
+
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES 
+(25285, 0, 0, 0, 10, 0, 100, 0, 1, 50, 120000, 300000, 80, 2528500, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Harbinger Vurenn - OOC LOS - Run Script'),
+(31033, 0, 0, 0, 10, 0, 100, 0, 1, 20, 600000, 900000, 1, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Crusader of Virtue - OOC LOS - Say Line'),
+(2528500, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Harbinger Vurenn - Script - Say Line 0'),
+(2528500, 9, 1, 0, 0, 0, 100, 0, 8000, 8000, 0, 0, 1, 0, 0, 0, 0, 0, 0, 19, 25301, 0, 0, 0, 0, 0, 0, 'Harbinger Vurenn - Script - Say Line 0 (Counselor Talbot)'),
+(2528500, 9, 2, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 1, 2, 0, 0, 0, 0, 0, 19, 25250, 0, 0, 0, 0, 0, 0, 'Harbinger Vurenn - Script - Say Line 2 (General Arlos)'),
+(2528500, 9, 3, 0, 0, 0, 100, 0, 12000, 12000, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Harbinger Vurenn - Script - Say Line 1');
+
+DELETE FROM `creature_text` WHERE `entry` IN(25301,25285,31033);
+DELETE FROM `creature_text` WHERE `entry` =25250 AND `groupid`=2;
+
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`,`BroadcastTextID`) VALUES
+(25250, 2, 0, 'Your offer will be carefully considered, harbinger.  In the meantime we will make use of your delegation in an advisory role.', 12, 7, 100, 1, 0, 0, 'General Arlos',24790),
+(25301, 0, 0, 'Our troops, general, consist mostly of villagers and peasants.  Good men, but not quite rid of the prejudices and superstitions of their upbringing.  They''re not ready to fight alongside our more exotic allies.', 12, 7, 100, 1, 0, 0, 'Counselor Talbot',24789),
+(25285, 0, 0, 'Give the word, general.  I will have two regiments at your disposal in a month''s time.', 12, 7, 100, 0, 0, 0, 'Harbinger Vurenn',24787),
+(25285, 1, 0, 'Very well, general.  Should you change your mind, my people will be more than willing to provide military assistance.', 12, 7, 100, 0, 0, 0, 'Harbinger Vurenn',24788),
+(31033, 0, 0, 'There goes the hero of the Vanguard!', 12, 0, 100, 66, 0, 0, 'Crusader of Virtue',31385),
+(31033, 0, 1, '%s cheers at you.', 16, 1, 100, 71, 0, 0, 'Crusader of Virtue',25275),
+(31033, 0, 2, 'We couldn''t have done it without you, $g sir:ma''am;.', 12, 0, 100, 66, 0, 0, 'Crusader of Virtue',31384),
+(31033, 0, 3, 'You honor us with your presence, $n.', 12, 0, 100, 66, 0, 0, 'Crusader of Virtue',31386),
+(31033, 0, 4, 'Thank you, $n. From the bottom of my heart. Thank you.', 12, 0, 100, 66, 0, 0, 'Crusader of Virtue',31388),
+(31033, 0, 5, 'Call on me anytime, $n.', 12, 0, 100, 66, 0, 0, 'Crusader of Virtue',31389);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry`=31033;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES 
+(22, 1, 31033, 0, 0, 8, 0, 13157, 0, 0, 0, 0, 0, '', 'Crusader of Virtue - Only run SAI if player is rewarded for quest 13157');
diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp
index 9f565c8d58d..f739c0f35dd 100644
--- a/src/server/game/Instances/InstanceSaveMgr.cpp
+++ b/src/server/game/Instances/InstanceSaveMgr.cpp
@@ -385,7 +385,7 @@ void InstanceSaveManager::LoadResetTimes()
             if (oldresettime != newresettime)
                 CharacterDatabase.DirectPExecute("UPDATE instance_reset SET resettime = '%u' WHERE mapid = '%u' AND difficulty = '%u'", uint32(newresettime), mapid, difficulty);
 
-            SetResetTimeFor(mapid, difficulty, newresettime);
+            InitializeResetTimeFor(mapid, difficulty, newresettime);
         } while (result->NextRow());
     }
 
@@ -422,7 +422,7 @@ void InstanceSaveManager::LoadResetTimes()
             CharacterDatabase.DirectPExecute("UPDATE instance_reset SET resettime = '" UI64FMTD "' WHERE mapid = '%u' AND difficulty= '%u'", (uint64)t, mapid, difficulty);
         }
 
-        SetResetTimeFor(mapid, difficulty, t);
+        InitializeResetTimeFor(mapid, difficulty, t);
 
         // schedule the global reset/warning
         uint8 type;
diff --git a/src/server/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h
index 72d180c2373..b2c86d5152b 100644
--- a/src/server/game/Instances/InstanceSaveMgr.h
+++ b/src/server/game/Instances/InstanceSaveMgr.h
@@ -191,11 +191,20 @@ class InstanceSaveManager
             return itr != m_resetTimeByMapDifficulty.end() ? itr->second : 0;
         }
 
-        void SetResetTimeFor(uint32 mapid, Difficulty d, time_t t)
+        // Use this on startup when initializing reset times
+        void InitializeResetTimeFor(uint32 mapid, Difficulty d, time_t t)
         {
             m_resetTimeByMapDifficulty[MAKE_PAIR32(mapid, d)] = t;
         }
 
+        // Use this only when updating existing reset times
+        void SetResetTimeFor(uint32 mapid, Difficulty d, time_t t)
+        {
+            ResetTimeByMapDifficultyMap::iterator itr = m_resetTimeByMapDifficulty.find(MAKE_PAIR32(mapid, d));
+            ASSERT(itr != m_resetTimeByMapDifficulty.end());
+            itr->second = t;
+        }
+
         ResetTimeByMapDifficultyMap const& GetResetTimeMap() const
         {
             return m_resetTimeByMapDifficulty;
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index a487d212370..fce136bc21a 100644
--- a/src/server/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -267,9 +267,9 @@ ChangeWeatherInterval = 600000
 #
 #    PlayerSaveInterval
 #        Description: Time (in milliseconds) for player save interval.
-#        Default:     900000 - (15 min)
+#        Default:     90000 - (90 seconds)
 
-PlayerSaveInterval = 900000
+PlayerSaveInterval = 90000
 
 #
 #    PlayerSave.Stats.MinLevel
@@ -289,7 +289,7 @@ PlayerSave.Stats.SaveOnlyOnLogout = 1
 
 #
 #    mmap.enablePathFinding
-#        Description: Enable/Disable pathfinding using mmaps - experimental.
+#        Description: Enable/Disable pathfinding using mmaps - recommended.
 #        Default:     0 - (Disabled)
 #                     1 - (Enabled)
 
@@ -2004,9 +2004,9 @@ AutoBroadcast.Center = 0
 #
 #    AutoBroadcast.Timer
 #        Description: Timer (in milliseconds) for auto broadcasts.
-#        Default:     60000 - (60 seconds)
+#        Default:     60000 - (10 minutes)
 
-AutoBroadcast.Timer = 60000
+AutoBroadcast.Timer = 600000
 
 #
 ###################################################################################################