Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Spells: Removed unneccessary checks from skill spell effects

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/77429d679a484379f077c1fe2b50f0fd8f742e78)
This commit is contained in:
hondacrx
2024-01-30 09:37:07 -05:00
parent 228f2649f0
commit 5010d90d05
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Player/Player.Quest.cs
+1 -1
View File
@@ -2569,7 +2569,7 @@ namespace Game.Entities
if (CanCompleteQuest(questId, objective.Id)) if (CanCompleteQuest(questId, objective.Id))
CompleteQuest(questId); 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); IncompleteQuest(questId);
} }
} }
Source/Game/Spells/SpellEffects.cs
+1 -3
View File
@@ -1951,8 +1951,6 @@ namespace Game.Spells
return; return;
uint skillid = (uint)effectInfo.MiscValue; 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()); SkillRaceClassInfoRecord rcEntry = Global.DB2Mgr.GetSkillRaceClassInfo(skillid, playerTarget.GetRace(), playerTarget.GetClass());
if (rcEntry == null) if (rcEntry == null)
@@ -4286,7 +4284,7 @@ namespace Game.Spells
return; return;
uint skillid = (uint)effectInfo.MiscValue; uint skillid = (uint)effectInfo.MiscValue;
if (effectInfo.Effect == SpellEffectName.Skill && playerTarget.GetSkillStep(skillid) >= damage) if (playerTarget.GetSkillStep(skillid) >= damage)
return; return;
var rcEntry = Global.DB2Mgr.GetSkillRaceClassInfo(skillid, playerTarget.GetRace(), playerTarget.GetClass()); var rcEntry = Global.DB2Mgr.GetSkillRaceClassInfo(skillid, playerTarget.GetRace(), playerTarget.GetClass());