From 140abe98d176bda757b4e33c6488a95160eff44a Mon Sep 17 00:00:00 2001 From: hondacrx Date: Mon, 9 Aug 2021 11:39:46 -0400 Subject: [PATCH] Misc Fixes --- Source/Game/Entities/Unit/Unit.cs | 2 +- Source/Game/Globals/ObjectManager.cs | 2 +- Source/Scripts/Spells/Priest.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Game/Entities/Unit/Unit.cs b/Source/Game/Entities/Unit/Unit.cs index b891ed832..5fa099c5e 100644 --- a/Source/Game/Entities/Unit/Unit.cs +++ b/Source/Game/Entities/Unit/Unit.cs @@ -3993,7 +3993,7 @@ namespace Game.Entities } // Sanctified Wrath (bypass damage reduction) - if (attacker != null && TakenTotalMod < 1.0f) + if (TakenTotalMod < 1.0f) { SpellSchoolMask attackSchoolMask = spellProto != null ? spellProto.GetSchoolMask() : damageSchoolMask; diff --git a/Source/Game/Globals/ObjectManager.cs b/Source/Game/Globals/ObjectManager.cs index 7446bdca2..9ff42c531 100644 --- a/Source/Game/Globals/ObjectManager.cs +++ b/Source/Game/Globals/ObjectManager.cs @@ -3912,7 +3912,7 @@ namespace Game } GameObjectOverride gameObjectOverride = new(); - gameObjectOverride.Faction = result.Read(1); + gameObjectOverride.Faction = result.Read(1); gameObjectOverride.Flags = (GameObjectFlags)result.Read(2); _gameObjectOverrideStorage[spawnId] = gameObjectOverride; diff --git a/Source/Scripts/Spells/Priest.cs b/Source/Scripts/Spells/Priest.cs index 7d0e3876a..66b5d0e32 100644 --- a/Source/Scripts/Spells/Priest.cs +++ b/Source/Scripts/Spells/Priest.cs @@ -503,7 +503,7 @@ namespace Scripts.Spells.Priest if (rhs == explTarget) // anything > explTarget: always false return -1; - return MakeSortTuple(lhs).Equals(rhs) ? 1 : -1; + return MakeSortTuple(lhs).Equals(MakeSortTuple(rhs)) ? 1 : -1; }); targets.Resize(maxTargets);