diff options
| -rw-r--r-- | sql/updates/world/master/2021_12_25_03_world_spells_rogue.sql | 2 | ||||
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_rogue.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sql/updates/world/master/2021_12_25_03_world_spells_rogue.sql b/sql/updates/world/master/2021_12_25_03_world_spells_rogue.sql index 5563d75834c..407dab2534c 100644 --- a/sql/updates/world/master/2021_12_25_03_world_spells_rogue.sql +++ b/sql/updates/world/master/2021_12_25_03_world_spells_rogue.sql @@ -23,7 +23,7 @@ INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES (185438, 'spell_rog_shadowstrike'); -- Spell Procs -DELETE FROM `spell_proc` WHERE `SpellId` IN (79134); +DELETE FROM `spell_proc` WHERE `SpellId` IN (79134,227151); INSERT INTO `spell_proc` (`SpellId`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`SpellFamilyMask3`,`ProcFlags`,`SpellTypeMask`,`SpellPhaseMask`,`HitMask`,`AttributesMask`,`DisableEffectsMask`,`ProcsPerMinute`,`Chance`,`Cooldown`,`Charges`) VALUES (79134, 0, 8, 0x100100, 0x0, 0x0, 0x0, 0, 1, 2, 0x403, 0x0, 0, 0, 0, 0, 0), -- Venomous Wounds (227151, 0, 8, 0x0, 0x0, 0x0, 0x0, 0, 7, 2, 0x403, 0x8, 0, 0, 0, 0, 0); -- Symbols of Death (Crit Aura) diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 5953cab5b56..e5bbd65f069 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -7338,7 +7338,7 @@ void Spell::DelayedChannel() bool Spell::HasPowerTypeCost(Powers power) const { - return GetPowerTypeCostAmount(power).has_value(); + return GetPowerTypeCostAmount(power).is_initialized(); } Optional<int32> Spell::GetPowerTypeCostAmount(Powers power) const diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index a50a6b468ca..da374f536dc 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -91,7 +91,7 @@ Optional<int32> GetFinishingMoveCPCost(Spell const* spell) * A finishing move is a spell that cost combo points */ bool IsFinishingMove(Spell const* spell) { - return GetFinishingMoveCPCost(spell).has_value(); + return GetFinishingMoveCPCost(spell).is_initialized(); } // 53 - Backstab @@ -581,7 +581,7 @@ class spell_rog_rupture : public SpellScriptLoader // Venomous Wounds: if unit dies while being affected by rupture, regain energy based on remaining duration Optional<SpellPowerCost> cost = GetSpellInfo()->CalcPowerCost(POWER_ENERGY, false, caster, GetSpellInfo()->GetSchoolMask(), nullptr); - if (!cost.has_value()) + if (!cost) return; float pct = float(aura->GetDuration()) / float(aura->GetMaxDuration()); |