Merge pull request #419 from TrinityCore/master

Update 01.24.25
KamiliaBlow · Jan 24, 2025 · 62fadf4 · 62fadf4
2 parents d7d4b41 + fa06e7a
commit 62fadf4
Show file tree

Hide file tree

Showing 19 changed files with 2,813 additions and 221 deletions.
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
@@ -912,7 +912,13 @@ INSERT INTO `build_auth_key` VALUES
 (58630,'Mac','x64','WoWC',0x9745E7626C0D7D0A7F57DF1BB1EA4F16),
 (58630,'Win','A64','WoW',0xF74A9CB9D6918780C813E2EEE0F24DE0),
 (58630,'Win','x64','WoW',0x8C9CDCC711892EAAEA793DBBF3B0C850),
-(58630,'Win','x64','WoWC',0xC6A3638E0BAB3A98F40B8371E1BDAECA);
+(58630,'Win','x64','WoWC',0xC6A3638E0BAB3A98F40B8371E1BDAECA),
+(58680,'Mac','A64','WoW',0x5EE6ABE5386E08867F642B3DFD15A9D4),
+(58680,'Mac','A64','WoWC',0x22C636BB4ABBC4AD9AE8F30B6D947774),
+(58680,'Mac','x64','WoWC',0xA5FF81211CDCDD60B53C14F932732969),
+(58680,'Win','A64','WoW',0x9D6DC8BED265C898836593A9E654A1E1),
+(58680,'Win','x64','WoW',0xC1CEFF499F2C2ABF1913E55F65CF278C),
+(58680,'Win','x64','WoWC',0x0D6FC77C1D3830AAA871A9E29DCBE380);
 /*!40000 ALTER TABLE `build_auth_key` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1276,7 +1282,8 @@ INSERT INTO `build_info` VALUES
 (58238,11,0,7,NULL),
 (58533,11,0,7,NULL),
 (58608,11,0,7,NULL),
-(58630,11,0,7,NULL);
+(58630,11,0,7,NULL),
+(58680,11,0,7,NULL);
 /*!40000 ALTER TABLE `build_info` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2888,7 +2895,7 @@ CREATE TABLE `realmlist` (
   `timezone` tinyint unsigned NOT NULL DEFAULT '0',
   `allowedSecurityLevel` tinyint unsigned NOT NULL DEFAULT '0',
   `population` float NOT NULL DEFAULT '0',
-  `gamebuild` int unsigned NOT NULL DEFAULT '58630',
+  `gamebuild` int unsigned NOT NULL DEFAULT '58680',
   `Region` tinyint unsigned NOT NULL DEFAULT '1',
   `Battlegroup` tinyint unsigned NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
@@ -2903,7 +2910,7 @@ CREATE TABLE `realmlist` (
 LOCK TABLES `realmlist` WRITE;
 /*!40000 ALTER TABLE `realmlist` DISABLE KEYS */;
 INSERT INTO `realmlist` VALUES
-(1,'Trinity','127.0.0.1','127.0.0.1',NULL,NULL,'255.255.255.0',8085,0,0,1,0,0,58630,1,1);
+(1,'Trinity','127.0.0.1','127.0.0.1',NULL,NULL,'255.255.255.0',8085,0,0,1,0,0,58680,1,1);
 /*!40000 ALTER TABLE `realmlist` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3381,7 +3388,8 @@ INSERT INTO `updates` VALUES
 ('2024_12_22_00_auth.sql','6FDF0ABE9952CC96BE04A6BAA0F1161900B4AB88','ARCHIVED','2024-12-22 02:56:17',0),
 ('2025_01_11_00_auth.sql','B32F963095657E8877F3C1EEBB09C8AED55EEECC','RELEASED','2025-01-11 10:51:47',0),
 ('2025_01_15_00_auth.sql','8EA1C0A88F6F1EC3DA67DA01CDCF056A530DBB5F','RELEASED','2025-01-15 00:44:53',0),
-('2025_01_15_01_auth.sql','885A553B190CCD7A22791AF4EC3BC15C43DDC2D2','RELEASED','2025-01-15 10:27:39',0);
+('2025_01_15_01_auth.sql','885A553B190CCD7A22791AF4EC3BC15C43DDC2D2','RELEASED','2025-01-15 10:27:39',0),
+('2025_01_22_00_auth.sql','E08C40B02DB391DC1A478B6C714FDDDDB144F24F','RELEASED','2025-01-22 20:58:45',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 

diff --git a/sql/updates/auth/master/2025_01_22_00_auth.sql b/sql/updates/auth/master/2025_01_22_00_auth.sql
@@ -0,0 +1,21 @@
+DELETE FROM `build_info` WHERE `build` IN (58680);
+INSERT INTO `build_info` (`build`,`majorVersion`,`minorVersion`,`bugfixVersion`,`hotfixVersion`) VALUES
+(58680,11,0,7,NULL);
+
+DELETE FROM `build_auth_key` WHERE `build`=58680 AND `platform`='Mac' AND `arch`='A64' AND `type`='WoW';
+DELETE FROM `build_auth_key` WHERE `build`=58680 AND `platform`='Mac' AND `arch`='A64' AND `type`='WoWC';
+DELETE FROM `build_auth_key` WHERE `build`=58680 AND `platform`='Mac' AND `arch`='x64' AND `type`='WoWC';
+DELETE FROM `build_auth_key` WHERE `build`=58680 AND `platform`='Win' AND `arch`='A64' AND `type`='WoW';
+DELETE FROM `build_auth_key` WHERE `build`=58680 AND `platform`='Win' AND `arch`='x64' AND `type`='WoW';
+DELETE FROM `build_auth_key` WHERE `build`=58680 AND `platform`='Win' AND `arch`='x64' AND `type`='WoWC';
+INSERT INTO `build_auth_key` (`build`,`platform`,`arch`,`type`,`key`) VALUES
+(58680,'Mac','A64','WoW',0x5EE6ABE5386E08867F642B3DFD15A9D4),
+(58680,'Mac','A64','WoWC',0x22C636BB4ABBC4AD9AE8F30B6D947774),
+(58680,'Mac','x64','WoWC',0xA5FF81211CDCDD60B53C14F932732969),
+(58680,'Win','A64','WoW',0x9D6DC8BED265C898836593A9E654A1E1),
+(58680,'Win','x64','WoW',0xC1CEFF499F2C2ABF1913E55F65CF278C),
+(58680,'Win','x64','WoWC',0x0D6FC77C1D3830AAA871A9E29DCBE380);
+
+UPDATE `realmlist` SET `gamebuild`=58680 WHERE `gamebuild`=58630;
+
+ALTER TABLE `realmlist` CHANGE `gamebuild` `gamebuild` int unsigned NOT NULL DEFAULT '58680';
diff --git a/sql/updates/world/master/2025_01_21_00_world.sql b/sql/updates/world/master/2025_01_21_00_world.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `spell_target_position` DROP PRIMARY KEY;
+ALTER TABLE `spell_target_position` ADD `OrderIndex` int NOT NULL DEFAULT '0' AFTER `EffectIndex`;
+ALTER TABLE `spell_target_position` ADD PRIMARY KEY(`ID`,`EffectIndex`,`OrderIndex`);
diff --git a/sql/updates/world/master/2025_01_23_00_world.sql b/sql/updates/world/master/2025_01_23_00_world.sql
@@ -0,0 +1,14 @@
+DELIMITER ;;
+CREATE PROCEDURE serverside_spell_2025_01_23_00() BEGIN
+    IF NOT EXISTS (SELECT * FROM `information_schema`.`columns` WHERE `table_schema`=SCHEMA() AND `table_name`='serverside_spell' AND `column_name`='AttributesEx15') THEN
+
+    ALTER TABLE `serverside_spell` 
+       ADD COLUMN `AttributesEx15` int unsigned NOT NULL DEFAULT '0' AFTER `AttributesEx14`;
+
+    END IF;
+END;;
+
+DELIMITER ;
+CALL serverside_spell_2025_01_23_00();
+
+DROP PROCEDURE IF EXISTS serverside_spell_2025_01_23_00;