Merge branch '3.3.5' into ShatteredHalls

Author: Shauren

.github/workflows/linux-build.yml

@@ -24,7 +24,7 @@ jobs:
             pch: 0
             launcher: ccache
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v7
     - name: Set reusable strings
       id: strings
       shell: bash
@@ -38,7 +38,7 @@ jobs:
     - name: Restore nopch cache
       id: ccache-restore
       if: ${{ matrix.pch == '0' }}
-      uses: actions/cache@v4
+      uses: actions/cache@v6
       with:
         path: ${{ github.workspace }}/.ccache
         key: ${{ steps.strings.outputs.ccache-key-prefix }}-${{ github.ref_name }}-${{ github.sha }}

.github/workflows/macos-arm-build.yml

@@ -6,10 +6,10 @@ on:
 
 jobs:
   build:
-    runs-on: macos-14
+    runs-on: macos-15
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v7
 
     - name: Set reusable strings
       id: strings

.github/workflows/win-x64-build.yml

@@ -12,7 +12,7 @@ jobs:
       MYSQL_ROOT_DIR: C:/Program Files/MySQL/MySQL Server 8.0
       OPENSSL_ROOT_DIR: C:/libs/openssl
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v7
 
     - name: Set reusable strings
       id: strings
@@ -41,7 +41,7 @@ jobs:
 
     - name: Cache OpenSSL
       id: cache-openssl
-      uses: actions/cache@v4
+      uses: actions/cache@v6
       with:
         path: ${{ env.OPENSSL_ROOT_DIR }}
         key: ${{ steps.openssl-info.outputs.cache-key }}
@@ -95,7 +95,7 @@ jobs:
         ./worldserver --version
 
     - name: Upload Artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         path: ${{ steps.strings.outputs.build-output-dir }}/bin/${{ env.CMAKE_BUILD_TYPE }}
         name: TrinityCore335Win64VS2022

AUTHORS

@@ -14,7 +14,7 @@ Development of this project dates back to 2004, and was developed under various
 * MaNGOS project, 2005-2008, located at http://www.mangosproject.org
 * MaNGOS project, 2008-2011, located at http://getmangos.com
 * SD2 project, 2008-2009, located at http://getmangos.com
-* TrinityCore, 2008-2025, located at https://www.trinitycore.org/
+* TrinityCore, 2008-2026, located at https://www.trinitycore.org/
 
 ## Authorship of the code
 Authorship is assigned for each commit within the git history, which is stored in these git repositories:
@@ -37,7 +37,7 @@ The Authors of third party libraries are not explicitly mentioned, and usually a
 = TrinityCore -- Thanks/credits file =
 
 TrinityCore is a derivation/rewrite of MaNGOS, which was originally written
-by Team Python and the WoW Daemon Team. Many people further helped Trinity Core
+by Team Python and the WoW Daemon Team. Many people further helped TrinityCore
 by submitting bug reports, code patches, and suggestions. Thanks to the
 community!
 

COPYING

@@ -340,7 +340,7 @@ Public License instead of this License.
 
                             OpenSSL exception
 In addition, as a special exception, the TrinityCore project
-gives permission to link the code of its release of Trinity Core with
+gives permission to link the code of its release of TrinityCore with
 the OpenSSL project's "OpenSSL" library (or with modified versions of
 it that use the same license as the "OpenSSL" library), and distribute
 the linked executables.  You must obey the GNU General Public License

revision_data.h.in.cmake

@@ -40,7 +40,7 @@
 
 // Database updater base information
 #define DATABASE_MYSQL_EXECUTABLE   R"(@MYSQL_EXECUTABLE@)"
-#define DATABASE_FULL_DATABASE      "TDB_full_world_335.25101_2025_10_21.sql"
+#define DATABASE_FULL_DATABASE      "TDB_full_world_335.26091_2026_09_09.sql"
 
 // Windows resource defines
 #define TRINITY_COMPANYNAME_STR         "TrinityCore Developers"

sql/base/auth_database.sql

@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 8.0.43, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 8.0.46, for Linux (x86_64)
 --
 -- Host: localhost    Database: auth
 -- ------------------------------------------------------
--- Server version	8.0.43-0ubuntu0.22.04.2
+-- Server version	8.0.46-0ubuntu0.24.04.4
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -24,7 +24,7 @@ DROP TABLE IF EXISTS `account`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `account` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Identifier',
-  `username` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `username` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `salt` binary(32) NOT NULL,
   `verifier` binary(32) NOT NULL,
   `session_key_auth` binary(40) DEFAULT NULL,
@@ -2532,8 +2532,10 @@ INSERT INTO `updates` VALUES
 ('2024_11_22_00_auth.sql','F2C1D1572A3968E9E9D778EF7DC82778DF3EF887','ARCHIVED','2024-11-22 23:18:14',0),
 ('2025_02_14_00_auth.sql','4A30E92FF519BB41C520CDBF90019291217C26A2','ARCHIVED','2025-02-14 17:20:00',0),
 ('2025_10_21_00_auth.sql','1A221989F98337CB285B4328E791F5531CFD2454','ARCHIVED','2025-10-21 18:16:45',0),
-('2026_01_12_00_auth.sql','91644588146896CA04E6B8FEDEB34CF4FEB64EEF','RELEASED','2026-01-12 21:26:18',0),
-('2026_05_15_00_auth.sql','652E7EEDF5E2BBB426564B866B61307C45E43680','RELEASED','2026-05-15 13:56:56',0);
+('2026_01_12_00_auth.sql','91644588146896CA04E6B8FEDEB34CF4FEB64EEF','ARCHIVED','2026-01-12 21:26:18',0),
+('2026_05_15_00_auth.sql','652E7EEDF5E2BBB426564B866B61307C45E43680','ARCHIVED','2026-05-15 13:56:56',0),
+('2026_09_09_00_auth.sql','FC9D8C99E0FFFADDFDF094A13E5610F21F6E7F3B','ARCHIVED','2026-09-09 19:08:27',0),
+('2026_09_14_00_auth.sql','6A6C23E6373F02200883FCA702D152BF73DA4E5F','RELEASED','2026-09-14 16:54:36',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2672,4 +2674,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 2025-10-21 18:16:58
+-- Dump completed on 2026-09-09 19:08:54

sql/base/characters_database.sql

@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 8.0.43, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 8.0.46, for Linux (x86_64)
 --
 -- Host: localhost    Database: characters
 -- ------------------------------------------------------
--- Server version	8.0.43-0ubuntu0.22.04.2
+-- Server version	8.0.46-0ubuntu0.24.04.4
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -2233,7 +2233,7 @@ CREATE TABLE `mail` (
   `deliver_time` int unsigned NOT NULL DEFAULT '0',
   `money` int unsigned NOT NULL DEFAULT '0',
   `cod` int unsigned NOT NULL DEFAULT '0',
-  `checked` tinyint unsigned NOT NULL DEFAULT '0',
+  `checked` int unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   KEY `idx_receiver` (`receiver`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Mail System';
@@ -2693,7 +2693,9 @@ INSERT INTO `updates` VALUES
 ('2024_11_22_00_characters.sql','9EA2A4F88036D1D5F47EE8A6B634D52D0014986E','ARCHIVED','2024-11-22 23:18:14',0),
 ('2025_07_20_00_characters_2022_07_03_00_characters.sql','D3F04078C0846BCF7C8330AC20C39B8C3AEE7002','ARCHIVED','2022-07-03 23:37:24',0),
 ('2025_09_09_00_characters.sql','A1A793D656117C31DAA92653DF0BE4AE6354358A','ARCHIVED','2025-09-09 14:03:38',0),
-('2025_10_21_00_characters.sql','DAC3249AE0CF374815D6A656489FE7B0AD3AA051','ARCHIVED','2025-10-21 18:16:45',0);
+('2025_10_21_00_characters.sql','DAC3249AE0CF374815D6A656489FE7B0AD3AA051','ARCHIVED','2025-10-21 18:16:45',0),
+('2026_09_09_00_characters.sql','AEBBEFF9434695DE9A1ACBEEEF312B2C0791377B','ARCHIVED','2026-09-09 19:08:27',0),
+('2026_09_12_00_characters.sql','A476229E4CCA5553050524484DD685FDCCDF91EF','RELEASED','2026-09-11 23:59:59',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2864,4 +2866,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2025-10-21 18:16:58
+-- Dump completed on 2026-09-09 19:08:55

sql/base/dev/world_database.sql

@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 8.0.43, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 8.0.46, for Linux (x86_64)
 --
 -- Host: localhost    Database: world
 -- ------------------------------------------------------
--- Server version	8.0.43-0ubuntu0.22.04.2
+-- Server version	8.0.46-0ubuntu0.24.04.4
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -302,12 +302,13 @@ CREATE TABLE `conditions` (
   `ConditionValue1` int unsigned NOT NULL DEFAULT '0',
   `ConditionValue2` int unsigned NOT NULL DEFAULT '0',
   `ConditionValue3` int unsigned NOT NULL DEFAULT '0',
+  `ConditionStringValue1` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `NegativeCondition` tinyint unsigned NOT NULL DEFAULT '0',
   `ErrorType` int unsigned NOT NULL DEFAULT '0',
   `ErrorTextId` int unsigned NOT NULL DEFAULT '0',
   `ScriptName` char(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `Comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`)
+  PRIMARY KEY (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ConditionStringValue1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Condition System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -2301,11 +2302,11 @@ CREATE TABLE `player_levelstats` (
   `race` tinyint unsigned NOT NULL,
   `class` tinyint unsigned NOT NULL,
   `level` tinyint unsigned NOT NULL,
-  `str` tinyint unsigned NOT NULL,
-  `agi` tinyint unsigned NOT NULL,
-  `sta` tinyint unsigned NOT NULL,
-  `inte` tinyint unsigned NOT NULL,
-  `spi` tinyint unsigned NOT NULL,
+  `str` smallint unsigned NOT NULL COMMENT 'strength',
+  `agi` smallint unsigned NOT NULL COMMENT 'agility',
+  `sta` smallint unsigned NOT NULL COMMENT 'stamina',
+  `inte` smallint unsigned NOT NULL COMMENT 'intellect',
+  `spi` smallint unsigned NOT NULL COMMENT 'spirit',
   PRIMARY KEY (`race`,`class`,`level`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci PACK_KEYS=0 COMMENT='Stores levels stats.';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2725,6 +2726,8 @@ CREATE TABLE `quest_request_items` (
   `ID` int unsigned NOT NULL DEFAULT '0',
   `EmoteOnComplete` smallint unsigned NOT NULL DEFAULT '0',
   `EmoteOnIncomplete` smallint unsigned NOT NULL DEFAULT '0',
+  `EmoteOnCompleteDelay` int unsigned NOT NULL DEFAULT '0',
+  `EmoteOnIncompleteDelay` int unsigned NOT NULL DEFAULT '0',
   `CompletionText` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
@@ -2827,6 +2830,7 @@ CREATE TABLE `quest_template` (
   `RewardFactionID5` smallint unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
   `RewardFactionValue5` int NOT NULL DEFAULT '0',
   `RewardFactionOverride5` int NOT NULL DEFAULT '0',
+  `RewardFactionFlags` int unsigned NOT NULL DEFAULT '0',
   `TimeAllowed` int unsigned NOT NULL DEFAULT '0',
   `AllowableRaces` int unsigned NOT NULL DEFAULT '0',
   `LogTitle` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
@@ -2854,7 +2858,6 @@ CREATE TABLE `quest_template` (
   `RequiredItemCount4` smallint unsigned NOT NULL DEFAULT '0',
   `RequiredItemCount5` smallint unsigned NOT NULL DEFAULT '0',
   `RequiredItemCount6` smallint unsigned NOT NULL DEFAULT '0',
-  `Unknown0` tinyint unsigned NOT NULL DEFAULT '0',
   `ObjectiveText1` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `ObjectiveText2` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `ObjectiveText3` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
@@ -2904,11 +2907,11 @@ DROP TABLE IF EXISTS `quest_template_locale`;
 CREATE TABLE `quest_template_locale` (
   `ID` int unsigned NOT NULL DEFAULT '0',
   `locale` varchar(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
-  `Title` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
-  `Details` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
-  `Objectives` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
-  `EndText` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
-  `CompletedText` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `LogTitle` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `LogDescription` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `QuestDescription` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `AreaDescription` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `QuestCompletionLog` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `ObjectiveText1` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `ObjectiveText2` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `ObjectiveText3` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
@@ -3022,25 +3025,6 @@ CREATE TABLE `script_spline_chain_waypoints` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
---
--- Table structure for table `script_waypoint`
---
-
-DROP TABLE IF EXISTS `script_waypoint`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `script_waypoint` (
-  `entry` int unsigned NOT NULL DEFAULT '0' COMMENT 'creature_template entry',
-  `pointid` int unsigned NOT NULL DEFAULT '0',
-  `location_x` float NOT NULL DEFAULT '0',
-  `location_y` float NOT NULL DEFAULT '0',
-  `location_z` float NOT NULL DEFAULT '0',
-  `waittime` int unsigned NOT NULL DEFAULT '0' COMMENT 'waittime in millisecs',
-  `point_comment` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
-  PRIMARY KEY (`entry`,`pointid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Script Creature waypoints';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
 --
 -- Table structure for table `skill_discovery_template`
 --
@@ -3545,29 +3529,6 @@ CREATE TABLE `spell_script_names` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
---
--- Table structure for table `spell_scripts`
---
-
-DROP TABLE IF EXISTS `spell_scripts`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `spell_scripts` (
-  `id` int unsigned NOT NULL DEFAULT '0',
-  `effIndex` tinyint unsigned NOT NULL DEFAULT '0',
-  `delay` int unsigned NOT NULL DEFAULT '0',
-  `command` int unsigned NOT NULL DEFAULT '0',
-  `datalong` int unsigned NOT NULL DEFAULT '0',
-  `datalong2` int unsigned NOT NULL DEFAULT '0',
-  `dataint` int NOT NULL DEFAULT '0',
-  `x` float NOT NULL DEFAULT '0',
-  `y` float NOT NULL DEFAULT '0',
-  `z` float NOT NULL DEFAULT '0',
-  `o` float NOT NULL DEFAULT '0',
-  `Comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT ''
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
 --
 -- Table structure for table `spell_target_position`
 --
@@ -3984,26 +3945,6 @@ CREATE TABLE `waypoint_scripts` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
---
--- Table structure for table `waypoints`
---
-
-DROP TABLE IF EXISTS `waypoints`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `waypoints` (
-  `entry` int unsigned NOT NULL DEFAULT '0',
-  `pointid` int unsigned NOT NULL DEFAULT '0',
-  `position_x` float NOT NULL DEFAULT '0',
-  `position_y` float NOT NULL DEFAULT '0',
-  `position_z` float NOT NULL DEFAULT '0',
-  `orientation` float DEFAULT NULL,
-  `delay` int unsigned NOT NULL DEFAULT '0',
-  `point_comment` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
-  PRIMARY KEY (`entry`,`pointid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Creature waypoints';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
 --
 -- Dumping routines for database 'world'
 --
@@ -4071,4 +4012,4 @@ CREATE TABLE `waypoints` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2025-10-21 18:16:59
+-- Dump completed on 2026-09-09 19:08:56