Skip to content

Commit 6330659

Browse files
LannyELannyE
authored
Merge branch 'azerothcore:master' into master
2 parents bde1da1 + bb10c2c commit 6330659

File tree

25 files changed

+312
-133
lines changed

25 files changed

+312
-133
lines changed

‎data/sql/updates/db_world/2026_02_24_06.sql‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
-- DB update 2026_02_24_05 -> 2026_02_24_06
2+
--
3+
UPDATE `spell_proc`SET `ProcsPerMinute` = 2 WHERE `SpellId` = 51528;
4+
UPDATE `spell_proc`SET `ProcsPerMinute` = 4 WHERE `SpellId` = 51529;
5+
UPDATE `spell_proc`SET `ProcsPerMinute` = 6 WHERE `SpellId` = 51530;
6+
UPDATE `spell_proc`SET `ProcsPerMinute` = 8 WHERE `SpellId` = 51531;
7+
UPDATE `spell_proc`SET `ProcsPerMinute` = 10 WHERE `SpellId` = 51532;

‎data/sql/updates/db_world/2026_02_25_00.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-- DB update 2026_02_24_06 -> 2026_02_25_00
2+
--
3+
UPDATE `conditions` SET `ConditionValue3` = 2 WHERE `SourceGroup` = 10389 AND `SourceEntry` IN (0, 1, 2, 3, 4, 5, 6, 8) AND `SourceTypeOrReferenceId` = 15;

‎data/sql/updates/db_world/2026_02_25_01.sql‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
-- DB update 2026_02_25_00 -> 2026_02_25_01
2+
DELETE FROM `smart_scripts` WHERE `entryorguid` = 194569 AND `source_type` = 1 AND `id` IN (0, 1, 2);
3+
4+
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 22 AND `SourceGroup` = 2 AND `SourceEntry` = 194569 AND `SourceId` = 1;
5+
DELETE FROM `spell_script_names` WHERE `spell_id` IN (64014, 64024, 64025, 64028, 64029, 64030, 64031, 64032, 65042);
6+
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
7+
(64014, 'spell_ulduar_teleporter'),
8+
(64024, 'spell_ulduar_teleporter'),
9+
(64025, 'spell_ulduar_teleporter'),
10+
(64028, 'spell_ulduar_teleporter'),
11+
(64029, 'spell_ulduar_teleporter'),
12+
(64030, 'spell_ulduar_teleporter'),
13+
(64031, 'spell_ulduar_teleporter'),
14+
(64032, 'spell_ulduar_teleporter'),
15+
(65042, 'spell_ulduar_teleporter');

‎data/sql/updates/db_world/2026_02_25_02.sql‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
-- DB update 2026_02_25_01 -> 2026_02_25_02
2+
-- Add acore_string for Debug.LFG config message (same pattern as Debug.Battleground / Debug.Arena)
3+
DELETE FROM `acore_string` WHERE `entry` = 30098;
4+
INSERT INTO `acore_string` (`entry`, `content_default`) VALUES
5+
(30098, 'LFG Debugging is already enabled in the config, thus you are unable to enable/disable it with command.');

‎data/sql/updates/db_world/2026_02_25_03.sql‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
-- DB update 2026_02_25_02 -> 2026_02_25_03
2+
-- HitMask 0x477 = PROC_HIT_NORMAL | PROC_HIT_CRITICAL | PROC_HIT_MISS | PROC_HIT_DODGE | PROC_HIT_PARRY | PROC_HIT_BLOCK | PROC_HIT_ABSORB
3+
DELETE FROM `spell_proc` WHERE `SpellId` = -65661;
4+
INSERT INTO `spell_proc` (`SpellId`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `ProcFlags`, `SpellTypeMask`, `SpellPhaseMask`, `HitMask`, `AttributesMask`, `DisableEffectsMask`, `ProcsPerMinute`, `Chance`, `Cooldown`, `Charges`) VALUES
5+
(-65661, 0, 15, 4194321, 537001988, 0, 0x10, 0, 2, 0x477, 0, 0, 0, 100, 0, 0);

‎data/sql/updates/db_world/2026_02_25_04.sql‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
-- DB update 2026_02_25_03 -> 2026_02_25_04
2+
-- Fix Killing Machine PPM values for ranks 3-5
3+
-- Previous values (1, 2, 4, 6, 8) used non-linear scaling
4+
-- Correct values (1, 2, 3, 4, 5) use linear scaling matching tooltip
5+
-- Formula: attackSpeed * talentRank / 60, yielding talentRank PPM
6+
7+
UPDATE `spell_proc` SET `ProcsPerMinute` = 3 WHERE `SpellId` = 51128; -- Killing Machine Rank 3
8+
UPDATE `spell_proc` SET `ProcsPerMinute` = 4 WHERE `SpellId` = 51129; -- Killing Machine Rank 4
9+
UPDATE `spell_proc` SET `ProcsPerMinute` = 5 WHERE `SpellId` = 51130; -- Killing Machine Rank 5

‎data/sql/updates/db_world/2026_02_25_05.sql‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
-- DB update 2026_02_25_04 -> 2026_02_25_05
2+
-- Threat of Thassarian: OH attack should fire even when MH misses/dodges/parries
3+
-- SpellTypeMask 0 = don't filter by spell type (miss/dodge/parry have no damage, so
4+
-- PROC_SPELL_TYPE_DAMAGE won't match - need to allow PROC_SPELL_TYPE_NO_DMG_HEAL too)
5+
-- HitMask 0x477 = PROC_HIT_NORMAL | PROC_HIT_CRITICAL | PROC_HIT_MISS | PROC_HIT_DODGE | PROC_HIT_PARRY | PROC_HIT_BLOCK | PROC_HIT_ABSORB
6+
DELETE FROM `spell_proc` WHERE `SpellId` = -65661;
7+
INSERT INTO `spell_proc` (`SpellId`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `ProcFlags`, `SpellTypeMask`, `SpellPhaseMask`, `HitMask`, `AttributesMask`, `DisableEffectsMask`, `ProcsPerMinute`, `Chance`, `Cooldown`, `Charges`) VALUES
8+
(-65661, 0, 15, 4194321, 537001988, 0, 0x10, 0, 2, 0x477, 0, 0, 0, 100, 0, 0);

‎src/server/apps/worldserver/worldserver.conf.dist‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4668,6 +4668,14 @@ Debug.Battleground = 0
46684668

46694669
Debug.Arena = 0
46704670

4671+
#
4672+
# Debug.LFG
4673+
# Description: Enable or disable LFG 1 player queue mode. (If enabled, the in-game command is disabled.)
4674+
# Default: 0 - (Disabled)
4675+
# 1 - (Enabled)
4676+
4677+
Debug.LFG = 0
4678+
46714679
#
46724680
###################################################################################################
46734681

‎src/server/game/DungeonFinding/LFGMgr.cpp‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
namespace lfg
5151
{
52-
LFGMgr::LFGMgr(): m_lfgProposalId(1), m_options(sWorld->getIntConfig(CONFIG_LFG_OPTIONSMASK)), m_Testing(false)
52+
LFGMgr::LFGMgr(): m_lfgProposalId(1), m_options(sWorld->getIntConfig(CONFIG_LFG_OPTIONSMASK)), m_Testing(sWorld->getBoolConfig(CONFIG_DEBUG_LFG))
5353
{
5454
for (uint8 team = 0; team < 2; ++team)
5555
{
@@ -893,8 +893,16 @@ namespace lfg
893893

894894
void LFGMgr::ToggleTesting()
895895
{
896-
m_Testing = !m_Testing;
897-
ChatHandler(nullptr).SendWorldText(m_Testing ? LANG_DEBUG_LFG_ON : LANG_DEBUG_LFG_OFF);
896+
if (sWorld->getBoolConfig(CONFIG_DEBUG_LFG))
897+
{
898+
m_Testing = true;
899+
ChatHandler(nullptr).SendWorldText(LANG_DEBUG_LFG_CONF);
900+
}
901+
else
902+
{
903+
m_Testing = !m_Testing;
904+
ChatHandler(nullptr).SendWorldText(m_Testing ? LANG_DEBUG_LFG_ON : LANG_DEBUG_LFG_OFF);
905+
}
898906
}
899907

900908
/**

‎src/server/game/Entities/Player/Player.cpp‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10183,23 +10183,10 @@ bool Player::HasSpellModApplied(SpellModifier* mod, Spell* spell)
1018310183

1018410184
void Player::SetSpellModTakingSpell(Spell* spell, bool apply)
1018510185
{
10186-
if (apply && m_spellModTakingSpell)
10187-
{
10188-
LOG_INFO("misc", "Player::SetSpellModTakingSpell (A1) - {}, {}", spell->m_spellInfo->Id, m_spellModTakingSpell->m_spellInfo->Id);
10186+
if (apply && m_spellModTakingSpell && m_spellModTakingSpell != spell)
10187+
return;
10188+
else if (!apply && m_spellModTakingSpell != spell)
1018910189
return;
10190-
//ASSERT(m_spellModTakingSpell == nullptr);
10191-
}
10192-
else if (!apply)
10193-
{
10194-
if (!m_spellModTakingSpell)
10195-
LOG_INFO("misc", "Player::SetSpellModTakingSpell (B1) - {}", spell->m_spellInfo->Id);
10196-
else if (m_spellModTakingSpell != spell)
10197-
{
10198-
LOG_INFO("misc", "Player::SetSpellModTakingSpell (C1) - {}, {}", spell->m_spellInfo->Id, m_spellModTakingSpell->m_spellInfo->Id);
10199-
return;
10200-
}
10201-
//ASSERT(m_spellModTakingSpell && m_spellModTakingSpell == spell);
10202-
}
1020310190

1020410191
m_spellModTakingSpell = apply ? spell : nullptr;
1020510192
}

0 commit comments

Comments
 (0)