From faa262db9900e542cd50e09744b68771183329db Mon Sep 17 00:00:00 2001 From: MagicBot Date: Mon, 1 Apr 2024 14:21:16 -0400 Subject: [PATCH] Revert "Temp fix for 3 modifiers" This reverts commit 6955f691562f9652940e5c116b8df7047d45b501. --- src/engine/powers/effectmodifiers/HealthEffectModifier.java | 2 +- src/engine/powers/effectmodifiers/ManaEffectModifier.java | 2 +- src/engine/powers/effectmodifiers/StaminaEffectModifier.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/engine/powers/effectmodifiers/HealthEffectModifier.java b/src/engine/powers/effectmodifiers/HealthEffectModifier.java index 0f499e50..83d8856d 100644 --- a/src/engine/powers/effectmodifiers/HealthEffectModifier.java +++ b/src/engine/powers/effectmodifiers/HealthEffectModifier.java @@ -193,7 +193,7 @@ public class HealthEffectModifier extends AbstractEffectModifier { }*/ PlayerBonuses bonus = ac.getBonuses(); - if (!skipImmune && bonus.getFloat(ModType.BlackMantle, SourceType.Heal) > trains) { + if (!skipImmune && bonus.getFloat(ModType.BlackMantle, SourceType.Heal) >= trains) { ModifyHealthMsg mhm = new ModifyHealthMsg(source, ac, 0f, 0f, 0f, powerID, powerName, trains, effectID); mhm.setUnknown03(5); //set target is immune DispatchMessage.sendToAllInRange(ac, mhm); diff --git a/src/engine/powers/effectmodifiers/ManaEffectModifier.java b/src/engine/powers/effectmodifiers/ManaEffectModifier.java index c94d5d27..5bf66393 100644 --- a/src/engine/powers/effectmodifiers/ManaEffectModifier.java +++ b/src/engine/powers/effectmodifiers/ManaEffectModifier.java @@ -142,7 +142,7 @@ public class ManaEffectModifier extends AbstractEffectModifier { } } PlayerBonuses bonus = ac.getBonuses(); - if (!skipImmune && bonus.getFloat(ModType.BlackMantle, SourceType.Heal) > trains) { + if (!skipImmune && bonus.getFloat(ModType.BlackMantle, SourceType.Heal) >= trains) { ModifyHealthMsg mhm = new ModifyHealthMsg(source, ac, 0f, 0f, 0f, powerID, powerName, trains, effectID); mhm.setUnknown03(5); //set target is immune DispatchMessage.sendToAllInRange(ac, mhm); diff --git a/src/engine/powers/effectmodifiers/StaminaEffectModifier.java b/src/engine/powers/effectmodifiers/StaminaEffectModifier.java index d1010e85..4dcfb815 100644 --- a/src/engine/powers/effectmodifiers/StaminaEffectModifier.java +++ b/src/engine/powers/effectmodifiers/StaminaEffectModifier.java @@ -140,7 +140,7 @@ public class StaminaEffectModifier extends AbstractEffectModifier { } } PlayerBonuses bonus = ac.getBonuses(); - if (!skipImmune && bonus.getFloat(ModType.BlackMantle, SourceType.Heal) > trains) { + if (!skipImmune && bonus.getFloat(ModType.BlackMantle, SourceType.Heal) >= trains) { ModifyHealthMsg mhm = new ModifyHealthMsg(source, ac, 0f, 0f, 0f, powerID, powerName, trains, effectID); mhm.setUnknown03(5); //set target is immune DispatchMessage.sendToAllInRange(ac, mhm);