Merge branch 'master' of github.com:azerothcore/azerothcore-wotlk into Playerbot

src/server/shared/Secrets/SecretMgr.h

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __WARHEAD_SECRETMGR_H__
-#define __WARHEAD_SECRETMGR_H__
+#ifndef __ACORE_SECRETMGR_H__
+#define __ACORE_SECRETMGR_H__
 
 #include "BigNumber.h"
 #include "Common.h"

src/server/shared/SharedDefines.h

@@ -216,7 +216,7 @@ enum FactionTemplates
 #define MIN_REPUTATION_RANK (REP_HATED)
 #define MAX_REPUTATION_RANK 8
 
-#define MAX_SPILLOVER_FACTIONS 4
+#define MAX_SPILLOVER_FACTIONS 6
 
 enum MoneyConstants
 {