From 5010d90d05c1fc0dac7da0db7964a91b9ae09ade Mon Sep 17 00:00:00 2001 From: hondacrx Date: Tue, 30 Jan 2024 09:37:07 -0500 Subject: [PATCH] Core/Spells: Removed unneccessary checks from skill spell effects Port From (https://github.com/TrinityCore/TrinityCore/commit/77429d679a484379f077c1fe2b50f0fd8f742e78) --- Source/Game/Entities/Player/Player.Quest.cs | 2 +- Source/Game/Spells/SpellEffects.cs | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Source/Game/Entities/Player/Player.Quest.cs b/Source/Game/Entities/Player/Player.Quest.cs index 7e5967e30..cb06bb46f 100644 --- a/Source/Game/Entities/Player/Player.Quest.cs +++ b/Source/Game/Entities/Player/Player.Quest.cs @@ -2569,7 +2569,7 @@ namespace Game.Entities if (CanCompleteQuest(questId, objective.Id)) CompleteQuest(questId); } - else if (!(objective.Flags.HasAnyFlag(QuestObjectiveFlags.Optional) && objectiveStatusData.QuestStatusPair.Status.Status == QuestStatus.Complete) + else if (!objective.Flags.HasAnyFlag(QuestObjectiveFlags.Optional) && objectiveStatusData.QuestStatusPair.Status.Status == QuestStatus.Complete) IncompleteQuest(questId); } } diff --git a/Source/Game/Spells/SpellEffects.cs b/Source/Game/Spells/SpellEffects.cs index e77ccb033..a09d220c6 100644 --- a/Source/Game/Spells/SpellEffects.cs +++ b/Source/Game/Spells/SpellEffects.cs @@ -1951,8 +1951,6 @@ namespace Game.Spells return; uint skillid = (uint)effectInfo.MiscValue; - if (effectInfo.Effect == SpellEffectName.Skill && playerTarget.GetSkillStep(skillid) >= damage) - return; SkillRaceClassInfoRecord rcEntry = Global.DB2Mgr.GetSkillRaceClassInfo(skillid, playerTarget.GetRace(), playerTarget.GetClass()); if (rcEntry == null) @@ -4286,7 +4284,7 @@ namespace Game.Spells return; uint skillid = (uint)effectInfo.MiscValue; - if (effectInfo.Effect == SpellEffectName.Skill && playerTarget.GetSkillStep(skillid) >= damage) + if (playerTarget.GetSkillStep(skillid) >= damage) return; var rcEntry = Global.DB2Mgr.GetSkillRaceClassInfo(skillid, playerTarget.GetRace(), playerTarget.GetClass());