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

roollback extra effect cancel on damage

Browse Source
This commit is contained in:
FatBoy committed 2026-02-03 11:45:47 -06:00
1 parent 0d1d00e2d1
commit 461e4e1c3d
1 file changed
+3 -5
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/CombatManager.java
+3 -5
View File
@@ -462,13 +462,11 @@ public enum CombatManager {
if (damage > 0) { if (damage > 0) {
if (AbstractCharacter.IsAbstractCharacter(target)) { if (AbstractCharacter.IsAbstractCharacter(target))
((AbstractCharacter) target).modifyHealth(-damage, attacker, true); ((AbstractCharacter) target).modifyHealth(-damage, attacker, true);
//PowersManager.cancelOnTakeDamage((AbstractCharacter) target); else
((AbstractCharacter) target).cancelOnTakeDamage(damageType,damage);
}else {
((Building) target).modifyHealth(-damage, attacker); ((Building) target).modifyHealth(-damage, attacker);
}
int attackAnim = getSwingAnimation(null, null, slot); int attackAnim = getSwingAnimation(null, null, slot);
if (attacker.charItemManager.getEquipped().get(slot) != null) { if (attacker.charItemManager.getEquipped().get(slot) != null) {
if (attacker.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) { if (attacker.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) {