MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

ZergMultiplier fix

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-05-28 21:07:38 -05:00
parent 0955dff7aa
commit 2b1299ec4a
4 changed files with 9 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/AbstractCharacter.java
+9 -7
View File
@@ -1188,11 +1188,9 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
}
}
public final float modifyHealth(
final float value,
final AbstractCharacter attacker,
final boolean fromCost) {
public final float modifyHealth(float value,final AbstractCharacter attacker,final boolean fromCost) {
if(attacker.getObjectType().equals(GameObjectType.PlayerCharacter))
value *= ((PlayerCharacter)attacker).ZergMultiplier;
try {
try {
@@ -1248,9 +1246,11 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
}
public final float modifyMana(
final float value,
float value,
final AbstractCharacter attacker
) {
if(attacker.getObjectType().equals(GameObjectType.PlayerCharacter))
value *= ((PlayerCharacter)attacker).ZergMultiplier;
return this.modifyMana(value, attacker, false);
}
@@ -1287,9 +1287,11 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
*/
public final float modifyStamina(
final float value,
float value,
final AbstractCharacter attacker
) {
if(attacker.getObjectType().equals(GameObjectType.PlayerCharacter))
value *= ((PlayerCharacter)attacker).ZergMultiplier;
return this.modifyStamina(value, attacker, false);
}
src/engine/powers/effectmodifiers/HealthEffectModifier.java
-9
View File
@@ -171,15 +171,6 @@ public class HealthEffectModifier extends AbstractEffectModifier {
}
if (modAmount == 0f)
return;
if(source.getObjectType().equals(GameObjectType.PlayerCharacter)){
modAmount *= ((PlayerCharacter)source).ZergMultiplier;
}
if(source.getObjectType().equals(GameObjectType.Mob)){
Mob mob = (Mob)source;
if(mob.isPet() && mob.guardCaptain.getObjectType().equals(GameObjectType.PlayerCharacter)){
modAmount *= ((PlayerCharacter)mob.guardCaptain).ZergMultiplier;
}
}
if (AbstractWorldObject.IsAbstractCharacter(awo)) {
AbstractCharacter ac = (AbstractCharacter) awo;
src/engine/powers/effectmodifiers/ManaEffectModifier.java
-9
View File
@@ -134,15 +134,6 @@ public class ManaEffectModifier extends AbstractEffectModifier {
}
if (modAmount == 0f)
return;
if(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
modAmount *= ((PlayerCharacter)source).ZergMultiplier;
}
if(source.getObjectType().equals(Enum.GameObjectType.Mob)){
Mob mob = (Mob)source;
if(mob.isPet() && mob.guardCaptain.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
modAmount *= ((PlayerCharacter)mob.guardCaptain).ZergMultiplier;
}
}
if (AbstractWorldObject.IsAbstractCharacter(awo)) {
AbstractCharacter ac = (AbstractCharacter) awo;
int powerID = 0, effectID = 0;
src/engine/powers/effectmodifiers/StaminaEffectModifier.java
-9
View File
@@ -130,15 +130,6 @@ public class StaminaEffectModifier extends AbstractEffectModifier {
}
if (modAmount == 0f)
return;
if(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
modAmount *= ((PlayerCharacter)source).ZergMultiplier;
}
if(source.getObjectType().equals(Enum.GameObjectType.Mob)){
Mob mob = (Mob)source;
if(mob.isPet() && mob.guardCaptain.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
modAmount *= ((PlayerCharacter)mob.guardCaptain).ZergMultiplier;
}
}
if (AbstractWorldObject.IsAbstractCharacter(awo)) {
AbstractCharacter ac = (AbstractCharacter) awo;