Merge branch '3.3.5' into npcbots_3.3.5

# Conflicts:
#	.circleci/config.yml
#	README.md

cmake/platform/win/settings.cmake

@@ -1,6 +1,8 @@
-add_definitions(-D_WIN32_WINNT=0x0601)
+add_definitions(-D_WIN32_WINNT=0x0A00)      # Windows 10
+add_definitions(-DNTDDI_VERSION=0x0A000007) # 19H1 (1903)
 add_definitions(-DWIN32_LEAN_AND_MEAN)
 add_definitions(-DNOMINMAX)
+add_definitions(-DTRINITY_REQUIRED_WINDOWS_BUILD=18362)
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
   include(${CMAKE_SOURCE_DIR}/cmake/compiler/msvc/settings.cmake)

dep/boost/CMakeLists.txt

@@ -35,7 +35,7 @@ else()
   set(BOOST_REQUIRED_VERSION 1.71)
 endif()
 
-find_package(Boost ${BOOST_REQUIRED_VERSION} REQUIRED system filesystem program_options iostreams regex)
+find_package(Boost ${BOOST_REQUIRED_VERSION} REQUIRED system filesystem program_options iostreams regex locale)
 
 if(NOT Boost_FOUND)
   if(NOT DEFINED ENV{BOOST_ROOT} AND NOT DEFINED Boost_DIR AND NOT DEFINED BOOST_ROOT AND NOT DEFINED BOOSTROOT)

revision_data.h.in.cmake

@@ -9,7 +9,7 @@
  #define _SOURCE_DIRECTORY          R"(@CMAKE_SOURCE_DIR@)"
  #define _BUILD_DIRECTORY           R"(@BUILDDIR@)"
  #define _MYSQL_EXECUTABLE          R"(@MYSQL_EXECUTABLE@)"
- #define _FULL_DATABASE             "TDB_full_world_335.23061_2023_06_14.sql"
+ #define _FULL_DATABASE             "TDB_full_world_335.24011_2024_01_21.sql"
  #define VER_COMPANYNAME_STR        "TrinityCore Developers"
  #define VER_LEGALCOPYRIGHT_STR     "(c)2008-@rev_year@ TrinityCore"
  #define VER_FILEVERSION            0,0,0

sql/base/auth_database.sql

@@ -1,13 +1,13 @@
--- MySQL dump 10.13  Distrib 8.0.33, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 8.0.35, for Linux (x86_64)
 --
 -- Host: localhost    Database: auth
 -- ------------------------------------------------------
--- Server version	8.0.33-0ubuntu0.20.04.2
+-- Server version	8.0.35-0ubuntu0.20.04.1
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
 /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!50503 SET NAMES utf8 */;
+/*!50503 SET NAMES utf8mb4 */;
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -46,6 +46,7 @@ CREATE TABLE `account` (
   `muteby` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `locale` tinyint unsigned NOT NULL DEFAULT '0',
   `os` varchar(3) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `timezone_offset` smallint NOT NULL DEFAULT '0',
   `recruiter` int unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `idx_username` (`username`)
@@ -446,6 +447,7 @@ CREATE TABLE `rbac_linked_permissions` (
 LOCK TABLES `rbac_linked_permissions` WRITE;
 /*!40000 ALTER TABLE `rbac_linked_permissions` DISABLE KEYS */;
 INSERT INTO `rbac_linked_permissions` VALUES
+(192,7),
 (192,21),
 (192,42),
 (192,43),
@@ -472,6 +474,8 @@ INSERT INTO `rbac_linked_permissions` VALUES
 (192,796),
 (192,835),
 (193,48),
+(193,52),
+(193,53),
 (193,194),
 (193,197),
 (194,1),
@@ -520,7 +524,6 @@ INSERT INTO `rbac_linked_permissions` VALUES
 (195,24),
 (195,49),
 (195,199),
-(196,7),
 (196,202),
 (196,203),
 (196,204),
@@ -992,6 +995,8 @@ INSERT INTO `rbac_linked_permissions` VALUES
 (197,863),
 (197,864),
 (197,865),
+(197,884),
+(197,885),
 (198,218),
 (198,300),
 (198,312),
@@ -1170,6 +1175,8 @@ INSERT INTO `rbac_permissions` VALUES
 (49,'Forces to enter the email for confirmation on password change'),
 (50,'Allow user to check his own email with .account'),
 (51,'Allow trading between factions'),
+(52,'No battleground deserter debuff'),
+(53,'Can be AFK on the battleground'),
 (192,'Role: Sec Level Administrator'),
 (193,'Role: Sec Level Gamemaster'),
 (194,'Role: Sec Level Moderator'),
@@ -1789,7 +1796,9 @@ INSERT INTO `rbac_permissions` VALUES
 (878,'Command: debug questreset'),
 (879,'Command: debug poolstatus'),
 (880,'Command: pdump copy'),
-(881,'Command: reload vehicle_template');
+(881,'Command: reload vehicle_template'),
+(884,'Command: bg start'),
+(885,'Command: bg stop');
 /*!40000 ALTER TABLE `rbac_permissions` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2008,7 +2017,13 @@ INSERT INTO `updates` VALUES
 ('2023_02_05_00_auth.sql','DC8A2046EB4201D55342C541A0E9C398499E12B1','ARCHIVED','2023-02-05 14:50:30',0),
 ('2023_02_05_01_auth.sql','336E62A8850A3E78A1D0BD3E81FFD5769184BDF8','ARCHIVED','2023-02-05 15:58:32',0),
 ('2023_05_05_00_auth.sql','DEEB1D5533658E3479FC3C988EF4B9816C511BC3','ARCHIVED','2023-05-07 11:52:00',0),
-('2023_06_14_00_auth.sql','BB8A7EB214F4F3632C4F54EA596CB7C8FBA305D5','ARCHIVED','2023-06-14 19:34:24',0);
+('2023_06_14_00_auth.sql','BB8A7EB214F4F3632C4F54EA596CB7C8FBA305D5','ARCHIVED','2023-06-14 19:34:24',0),
+('2023_11_21_00_auth.sql','146E5E6EF94C5DB78343372A8FDB32B062B80040','ARCHIVED','2023-11-21 11:24:11',0),
+('2024_01_06_00_auth.sql','767D697594D5471B67CC0FDF0D7BB15374116A71','ARCHIVED','2024-01-06 09:53:51',0),
+('2024_01_06_01_auth.sql','3D9E0A906A357877DB8E7B72E0797AB38EF884BC','ARCHIVED','2024-01-06 11:33:07',0),
+('2024_01_06_02_auth.sql','B14F889C198A4F640A968BAB8A4C262AC61634C7','ARCHIVED','2024-01-06 12:43:47',0),
+('2024_01_06_03_auth.sql','693BFD4326314659BAD9A2C70D9526FF4625B393','ARCHIVED','2024-01-06 12:55:07',0),
+('2024_01_21_00_auth.sql','B45B95D7B608D6ACF1BCBA656718C7DEED8CFF00','ARCHIVED','2024-01-21 11:38:22',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2147,4 +2162,4 @@ SET character_set_client = @saved_cs_client;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2023-06-14 19:34:37
+-- Dump completed on 2024-01-21 11:38:23

sql/base/characters_database.sql

@@ -1,13 +1,13 @@
--- MySQL dump 10.13  Distrib 8.0.33, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 8.0.35, for Linux (x86_64)
 --
 -- Host: localhost    Database: characters
 -- ------------------------------------------------------
--- Server version	8.0.33-0ubuntu0.20.04.2
+-- Server version	8.0.35-0ubuntu0.20.04.1
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
 /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!50503 SET NAMES utf8 */;
+/*!50503 SET NAMES utf8mb4 */;
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -2682,7 +2682,8 @@ INSERT INTO `updates` VALUES
 ('2023_02_05_01_characters.sql','336E62A8850A3E78A1D0BD3E81FFD5769184BDF8','ARCHIVED','2023-02-05 15:58:32',0),
 ('2023_05_19_00_characters.sql','5E0C9338554BAA481566EDFF3FE2FCEFF1B67DA9','ARCHIVED','2023-05-19 18:40:42',0),
 ('2023_06_14_00_characters.sql','0595B21DCFC0A04F2D8DF1F7BC018C758895DBE5','ARCHIVED','2023-06-14 19:34:24',0),
-('2023_09_10_00_characters.sql','5DE09CA31B5168CF3622CB462816B6C598893D96','RELEASED','2023-09-10 12:23:34',0);
+('2023_09_10_00_characters.sql','5DE09CA31B5168CF3622CB462816B6C598893D96','ARCHIVED','2023-09-10 12:23:34',0),
+('2024_01_21_00_characters.sql','4D27D8DAC9F78795DB6938B54F32502EF8D8AAE6','ARCHIVED','2024-01-21 11:38:22',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2853,4 +2854,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2023-06-14 19:34:37
+-- Dump completed on 2024-01-21 11:38:24

sql/base/dev/world_database.sql

@@ -1,13 +1,13 @@
--- MySQL dump 10.13  Distrib 8.0.33, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 8.0.35, for Linux (x86_64)
 --
 -- Host: localhost    Database: world
 -- ------------------------------------------------------
--- Server version	8.0.33-0ubuntu0.20.04.2
+-- Server version	8.0.35-0ubuntu0.20.04.1
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
 /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!50503 SET NAMES utf8 */;
+/*!50503 SET NAMES utf8mb4 */;
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -4067,4 +4067,4 @@ CREATE TABLE `waypoints` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2023-06-14 19:34:39
+-- Dump completed on 2024-01-21 11:38:25

sql/old/3.3.5a/auth/23061_2024_01_21/2023_11_21_00_auth.sql

@@ -0,0 +1 @@
+ALTER TABLE `account` ADD `timezone_offset` smallint NOT NULL DEFAULT '0' AFTER `os`;

sql/old/3.3.5a/auth/23061_2024_01_21/2024_01_06_00_auth.sql

@@ -0,0 +1,7 @@
+--
+DELETE FROM `rbac_permissions` WHERE `id` = 52;
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES (52, "No battleground deserter debuff");
+
+DELETE FROM `rbac_linked_permissions` WHERE `linkedId` = 52;
+INSERT INTO `rbac_linked_permissions` (`id`, `linkedId`) VALUES
+(193, 52);

sql/old/3.3.5a/auth/23061_2024_01_21/2024_01_06_01_auth.sql

@@ -0,0 +1,7 @@
+--
+DELETE FROM `rbac_permissions` WHERE `id` = 53;
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES (53, "Can be AFK on the battleground");
+
+DELETE FROM `rbac_linked_permissions` WHERE `linkedId` = 53;
+INSERT INTO `rbac_linked_permissions` (`id`, `linkedId`) VALUES
+(193, 53);

sql/old/3.3.5a/auth/23061_2024_01_21/2024_01_06_02_auth.sql

@@ -0,0 +1,10 @@
+--
+DELETE FROM `rbac_permissions` WHERE `id` IN (884, 885);
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
+(884, "Command: bg start"),
+(885, "Command: bg stop");
+
+DELETE FROM `rbac_linked_permissions` WHERE `linkedId` IN (884, 885);
+INSERT INTO `rbac_linked_permissions` (`id`, `linkedId`) VALUES
+(197, 884),
+(197, 885);

sql/old/3.3.5a/auth/23061_2024_01_21/2024_01_06_03_auth.sql

@@ -0,0 +1,3 @@
+--
+DELETE FROM `rbac_linked_permissions` WHERE `linkedId` = 7;
+INSERT INTO `rbac_linked_permissions` (`id`, `linkedId`) VALUES (192, 7);

sql/old/3.3.5a/world/23061_2024_01_21/2023_11_11_00_world.sql

@@ -0,0 +1,2 @@
+-- Fix Halazzi texts id
+UPDATE `creature_text` SET `CreatureID`=23577 WHERE `CreatureID`=23557;

sql/old/3.3.5a/world/23061_2024_01_21/2023_11_29_00_world.sql

@@ -0,0 +1,4 @@
+--
+DELETE FROM `gameobject_queststarter` WHERE `id` = 156561;
+INSERT INTO `gameobject_queststarter` (`id`, `quest`) VALUES
+(156561, 176);