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

Final CombatManager

Browse Source
This commit is contained in:
MagicBot
2024-03-23 19:22:14 -04:00
parent 6a0599a972
commit 0fa042cece
7 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/AbstractCharacter.java
+5 -5
View File
@@ -1328,7 +1328,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
//TODO why is Handle REtaliate and cancelontakedamage in modifyHealth? shouldnt this be outside this method?
if (value < 0f && !fromCost) {
this.cancelOnTakeDamage();
FinalCombatManager.handleRetaliate(this, attacker);
CombatManager.handleRetaliate(this, attacker);
}
if(this.getObjectType().equals(GameObjectType.Mob)){
@@ -1395,7 +1395,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
}
if (value < 0f && !fromCost) {
this.cancelOnTakeDamage();
FinalCombatManager.handleRetaliate(this, attacker);
CombatManager.handleRetaliate(this, attacker);
}
return newMana - oldMana;
}
@@ -1434,7 +1434,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
}
if (value < 0f && !fromCost) {
this.cancelOnTakeDamage();
FinalCombatManager.handleRetaliate(this, attacker);
CombatManager.handleRetaliate(this, attacker);
}
return newStamina - oldStamina;
}
@@ -1469,7 +1469,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
}
if (oldMana > newMana && !fromCost) {
this.cancelOnTakeDamage();
FinalCombatManager.handleRetaliate(this, attacker);
CombatManager.handleRetaliate(this, attacker);
}
return newMana - oldMana;
}
@@ -1504,7 +1504,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
}
if (oldStamina > newStamina && !fromCost) {
this.cancelOnTakeDamage();
FinalCombatManager.handleRetaliate(this, attacker);
CombatManager.handleRetaliate(this, attacker);
}
return newStamina - oldStamina;