Merge pull request #428 from TrinityCore/master

Update 02.19.25
KamiliaBlow · Feb 18, 2025 · 8e4cf39 · 8e4cf39
2 parents d01c214 + 4c32d8f
commit 8e4cf39
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 9 deletions.
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
@@ -939,7 +939,14 @@ INSERT INTO `build_auth_key` VALUES
 (58911,'Mac','x64','WoWC',0xA4C80CDBC805A19FAB8EF1BAA483DB9A),
 (58911,'Win','A64','WoW',0xF02130BA7BFF2C0292F25F3C6240B2E8),
 (58911,'Win','x64','WoW',0x5EF341D9F5A27F796D5BD786A5BD5A16),
-(58911,'Win','x64','WoWC',0xA9C0BEA1B7351665091E6754A0A90A16);
+(58911,'Win','x64','WoWC',0xA9C0BEA1B7351665091E6754A0A90A16),
+(59207,'Mac','A64','WoW',0x2EC5EAA28DA705573D808A7E911F5D00),
+(59207,'Mac','A64','WoWC',0x23A35FDC661E9761FEAC93BF20A926EE),
+(59207,'Mac','x64','WoW',0x9E2B97FF7DEA87E951DDE91A65C2595B),
+(59207,'Mac','x64','WoWC',0x5FB60ADC82C68D1E50B70956BFBC77BC),
+(59207,'Win','A64','WoW',0x41AF3D9F83318D4FC4406BF5C23B20AB),
+(59207,'Win','x64','WoW',0x170FB48807771D186547DF96C59E5306),
+(59207,'Win','x64','WoWC',0xA9038B171DE62AF741304A4C0F273814);
 /*!40000 ALTER TABLE `build_auth_key` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1307,7 +1314,8 @@ INSERT INTO `build_info` VALUES
 (58680,11,0,7,NULL),
 (58773,11,0,7,NULL),
 (58867,11,0,7,NULL),
-(58911,11,0,7,NULL);
+(58911,11,0,7,NULL),
+(59207,11,0,7,NULL);
 /*!40000 ALTER TABLE `build_info` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2919,7 +2927,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 '58911',
+  `gamebuild` int unsigned NOT NULL DEFAULT '59207',
   `Region` tinyint unsigned NOT NULL DEFAULT '1',
   `Battlegroup` tinyint unsigned NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
@@ -2934,7 +2942,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,58911,1,1);
+(1,'Trinity','127.0.0.1','127.0.0.1',NULL,NULL,'255.255.255.0',8085,0,0,1,0,0,59207,1,1);
 /*!40000 ALTER TABLE `realmlist` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3416,7 +3424,8 @@ INSERT INTO `updates` VALUES
 ('2025_01_22_00_auth.sql','E08C40B02DB391DC1A478B6C714FDDDDB144F24F','RELEASED','2025-01-22 20:58:45',0),
 ('2025_01_29_00_auth.sql','7334CFE779D5F79AFAC8EA269950FC07E625810F','RELEASED','2025-01-29 12:57:32',0),
 ('2025_01_31_00_auth.sql','DF2640D25C15E41358C1ED46B4F86043583FC8FB','RELEASED','2025-01-31 11:51:23',0),
-('2025_02_03_00_auth.sql','87033116EF72051499AF23FE14545D828F5A9B59','RELEASED','2025-02-03 22:51:31',0);
+('2025_02_03_00_auth.sql','87033116EF72051499AF23FE14545D828F5A9B59','RELEASED','2025-02-03 22:51:31',0),
+('2025_02_19_00_auth.sql','6D0EBB3E2DD1B26682A424EDDC090F515BCA5B32','RELEASED','2025-02-19 00:16:52',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 

diff --git a/sql/updates/auth/master/2025_02_19_00_auth.sql b/sql/updates/auth/master/2025_02_19_00_auth.sql
@@ -0,0 +1,23 @@
+DELETE FROM `build_info` WHERE `build` IN (59207);
+INSERT INTO `build_info` (`build`,`majorVersion`,`minorVersion`,`bugfixVersion`,`hotfixVersion`) VALUES
+(59207,11,0,7,NULL);
+
+DELETE FROM `build_auth_key` WHERE `build`=59207 AND `platform`='Mac' AND `arch`='A64' AND `type`='WoW';
+DELETE FROM `build_auth_key` WHERE `build`=59207 AND `platform`='Mac' AND `arch`='A64' AND `type`='WoWC';
+DELETE FROM `build_auth_key` WHERE `build`=59207 AND `platform`='Mac' AND `arch`='x64' AND `type`='WoW';
+DELETE FROM `build_auth_key` WHERE `build`=59207 AND `platform`='Mac' AND `arch`='x64' AND `type`='WoWC';
+DELETE FROM `build_auth_key` WHERE `build`=59207 AND `platform`='Win' AND `arch`='A64' AND `type`='WoW';
+DELETE FROM `build_auth_key` WHERE `build`=59207 AND `platform`='Win' AND `arch`='x64' AND `type`='WoW';
+DELETE FROM `build_auth_key` WHERE `build`=59207 AND `platform`='Win' AND `arch`='x64' AND `type`='WoWC';
+INSERT INTO `build_auth_key` (`build`,`platform`,`arch`,`type`,`key`) VALUES
+(59207,'Mac','A64','WoW',0x2EC5EAA28DA705573D808A7E911F5D00),
+(59207,'Mac','A64','WoWC',0x23A35FDC661E9761FEAC93BF20A926EE),
+(59207,'Mac','x64','WoW',0x9E2B97FF7DEA87E951DDE91A65C2595B),
+(59207,'Mac','x64','WoWC',0x5FB60ADC82C68D1E50B70956BFBC77BC),
+(59207,'Win','A64','WoW',0x41AF3D9F83318D4FC4406BF5C23B20AB),
+(59207,'Win','x64','WoW',0x170FB48807771D186547DF96C59E5306),
+(59207,'Win','x64','WoWC',0xA9038B171DE62AF741304A4C0F273814);
+
+UPDATE `realmlist` SET `gamebuild`=59207 WHERE `gamebuild`=58911;
+
+ALTER TABLE `realmlist` CHANGE `gamebuild` `gamebuild` int unsigned NOT NULL DEFAULT '59207';
diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp
@@ -386,15 +386,17 @@ class spell_pal_blinding_light : public SpellScript
         return ValidateSpellInfo({ SPELL_PALADIN_BLINDING_LIGHT_EFFECT });
     }
 
-    void HandleDummy(SpellEffIndex /*effIndex*/)
+    void HandleDummy(SpellEffIndex /*effIndex*/) const
     {
-        if (Unit* target = GetHitUnit())
-            GetCaster()->CastSpell(target, SPELL_PALADIN_BLINDING_LIGHT_EFFECT, true);
+        GetCaster()->CastSpell(GetHitUnit(), SPELL_PALADIN_BLINDING_LIGHT_EFFECT, CastSpellExtraArgsInit{
+            .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR,
+            .TriggeringSpell = GetSpell()
+        });
     }
 
     void Register() override
     {
-        OnEffectHitTarget += SpellEffectFn(spell_pal_blinding_light::HandleDummy, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
+        OnEffectHitTarget += SpellEffectFn(spell_pal_blinding_light::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
     }
 };