From 31e56b4da60bc9d09ba1d0f0eaeec9dda6d5a5ba Mon Sep 17 00:00:00 2001
From: FatBoy-DOTC <justin.chucksinsulating@gmail.com>
Date: Fri, 16 Feb 2024 23:07:45 -0600
Subject: [PATCH] Revert "zerg mechanic work"
This reverts commit ba3fd7215b73d7c23a6afe00eb67eed34cb3e9bb.
---
src/engine/powers/effectmodifiers/HealthEffectModifier.java | 4 ++--
src/engine/powers/effectmodifiers/ManaEffectModifier.java | 4 ++--
src/engine/powers/effectmodifiers/StaminaEffectModifier.java | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/engine/powers/effectmodifiers/HealthEffectModifier.java b/src/engine/powers/effectmodifiers/HealthEffectModifier.java
index efedabec..61e6652f 100644
--- a/src/engine/powers/effectmodifiers/HealthEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/HealthEffectModifier.java
@@ -176,8 +176,8 @@ public class HealthEffectModifier extends AbstractEffectModifier {
if (!ac.isAlive())
return;
- if(source.getObjectType().equals(GameObjectType.PlayerCharacter)){
- modAmount *= ((PlayerCharacter)source).ZergMultiplier;
+ if(awo.getObjectType().equals(GameObjectType.PlayerCharacter)){
+ modAmount *= ((PlayerCharacter)ac).ZergMultiplier;
}
int powerID = 0, effectID = 0;
diff --git a/src/engine/powers/effectmodifiers/ManaEffectModifier.java b/src/engine/powers/effectmodifiers/ManaEffectModifier.java
index 10686659..8167fc0f 100644
--- a/src/engine/powers/effectmodifiers/ManaEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/ManaEffectModifier.java
@@ -157,8 +157,8 @@ public class ManaEffectModifier extends AbstractEffectModifier {
skipImmune = true;
}
}
- if(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
- modAmount *= ((PlayerCharacter)source).ZergMultiplier;
+ if(awo.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
+ modAmount *= ((PlayerCharacter)ac).ZergMultiplier;
}
PlayerBonuses bonus = ac.getBonuses();
if (!skipImmune && bonus.getFloat(ModType.BlackMantle, SourceType.Heal) >= trains) {
diff --git a/src/engine/powers/effectmodifiers/StaminaEffectModifier.java b/src/engine/powers/effectmodifiers/StaminaEffectModifier.java
index e7a89ce6..cd433e44 100644
--- a/src/engine/powers/effectmodifiers/StaminaEffectModifier.java
+++ b/src/engine/powers/effectmodifiers/StaminaEffectModifier.java
@@ -153,8 +153,8 @@ public class StaminaEffectModifier extends AbstractEffectModifier {
skipImmune = true;
}
}
- if(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
- modAmount *= ((PlayerCharacter)source).ZergMultiplier;
+ if(awo.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
+ modAmount *= ((PlayerCharacter)ac).ZergMultiplier;
}
PlayerBonuses bonus = ac.getBonuses();
if (!skipImmune && bonus.getFloat(ModType.BlackMantle, SourceType.Heal) >= trains) {