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

Merge remote-tracking branch 'origin/unified-combat-manager' into feature-json7.3

Browse Source 
# Conflicts:
#	src/engine/mobileAI/utilities/CombatUtilities.java
This commit is contained in:
MagicBot
2024-03-18 08:03:10 -04:00
parent 84f9d54ec0 9d7f2f39fe
commit 82c4e3169e
10 changed files with 481 additions and 1762 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/AbstractCharacter.java
+5 -5
View File
@@ -1332,7 +1332,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();
CombatManager.handleRetaliate(this, attacker);
FinalCombatManager.handleRetaliate(this, attacker);
}
if(this.getObjectType().equals(GameObjectType.Mob)){
@@ -1399,7 +1399,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
}
if (value < 0f && !fromCost) {
this.cancelOnTakeDamage();
CombatManager.handleRetaliate(this, attacker);
FinalCombatManager.handleRetaliate(this, attacker);
}
return newMana - oldMana;
}
@@ -1438,7 +1438,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
}
if (value < 0f && !fromCost) {
this.cancelOnTakeDamage();
CombatManager.handleRetaliate(this, attacker);
FinalCombatManager.handleRetaliate(this, attacker);
}
return newStamina - oldStamina;
}
@@ -1473,7 +1473,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
}
if (oldMana > newMana && !fromCost) {
this.cancelOnTakeDamage();
CombatManager.handleRetaliate(this, attacker);
FinalCombatManager.handleRetaliate(this, attacker);
}
return newMana - oldMana;
}
@@ -1508,7 +1508,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
}
if (oldStamina > newStamina && !fromCost) {
this.cancelOnTakeDamage();
CombatManager.handleRetaliate(this, attacker);
FinalCombatManager.handleRetaliate(this, attacker);
}
return newStamina - oldStamina;