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

5 files changed, 81 insertions, 9 deletions

diff --git a/src/server/authserver/Server/BattlenetPackets/BattlenetPackets.h b/src/server/authserver/Server/BattlenetPackets/BattlenetPackets.h
index 3ceee794d03..d4cd8600266 100644
--- a/src/server/authserver/Server/BattlenetPackets/BattlenetPackets.h
+++ b/src/server/authserver/Server/BattlenetPackets/BattlenetPackets.h
@@ -23,7 +23,7 @@
 #include "WoWRealmPackets.h"
 #include "FriendsPackets.h"
 #include "PresencePackets.h"
-//#include "ChatPackets.h"
+#include "ChatPackets.h"
 #include "SupportPackets.h"
 #include "AchievementPackets.h"
 #include "CachePackets.h"
diff --git a/src/server/authserver/Server/BattlenetPackets/ChatPackets.h b/src/server/authserver/Server/BattlenetPackets/ChatPackets.h
new file mode 100644
index 00000000000..ee11a1b732e
--- /dev/null
+++ b/src/server/authserver/Server/BattlenetPackets/ChatPackets.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/>
+ *
+ * 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
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ChatPackets_h__
+#define ChatPackets_h__
+
+#include "BattlenetPacketsBase.h"
+
+namespace Battlenet
+{
+    namespace Chat
+    {
+        enum Opcode
+        {
+            CMSG_JOIN_REQUEST_2                 = 0x00, // Not implemented
+            CMSG_LEAVE_REQUEST                  = 0x02, // Not implemented
+            CMSG_INVITE_REQUEST                 = 0x03, // Not implemented
+            CMSG_CREATE_AND_INVITE_REQUEST      = 0x0A, // Not implemented
+            CMSG_MESSAGE_SEND                   = 0x0B, // Not implemented
+            CMSG_DATAGRAM_CONNECTION_UPDATE     = 0x0D, // Not implemented
+            CMSG_REPORT_SPAM_REQUEST            = 0x0E, // Not implemented
+            CMSG_WHISPER_SEND                   = 0x13, // Not implemented
+            CMSG_ENUM_CATEGORY_DESCRIPTIONS     = 0x15, // Not implemented
+            CMSG_ENUM_CONFERENCE_DESCRIPTIONS   = 0x17, // Not implemented
+            CMSG_ENUM_CONFERENCE_MEMBER_COUNTS  = 0x19, // Not implemented
+            CMSG_MODIFY_CHANNEL_LIST_REQUEST    = 0x1B, // Not implemented
+
+            SMSG_MEMBERSHIP_CHANGE_NOTIFY       = 0x01, // Not implemented
+            SMSG_INVITE_NOTIFY                  = 0x04, // Not implemented
+            SMSG_INVITE_CANCELED                = 0x07, // Not implemented
+            SMSG_MESSAGE_RECV                   = 0x0B, // Not implemented
+            SMSG_MESSAGE_UNDELIVERABLE          = 0x0C, // Not implemented
+            SMSG_DATAGRAM_CONNECTION_UPDATE     = 0x0D, // Not implemented
+            SMSG_INVITE_FAILURE                 = 0x0F, // Not implemented
+            SMSG_SYSTEM_MESSAGE                 = 0x10, // Not implemented
+            SMSG_MESSAGE_BLOCKED                = 0x12, // Not implemented
+            SMSG_WHISPER_RECV                   = 0x13, // Not implemented
+            SMSG_WHISPER_UNDELIVERABLE          = 0x14, // Not implemented
+            SMSG_CATEGORY_DESCRIPTIONS          = 0x16, // Not implemented
+            SMSG_CONFERENCE_DESCRIPTIONS        = 0x18, // Not implemented
+            SMSG_CONFERENCE_MEMBER_COUNTS       = 0x1A, // Not implemented
+            SMSG_JOIN_NOTIFY_2                  = 0x1B, // Not implemented
+            SMSG_MODIFY_CHANNEL_LIST_RESPONSE   = 0x1C, // Not implemented
+            SMSG_CONFIG_CHANGED                 = 0x1D  // Not implemented
+        };
+    }
+}
+
+#endif // ChatPackets_h__
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
 
 #
 ###################################################################################################