forked from MagicBane/Server
fix charge bug
This commit is contained in:
@@ -1234,7 +1234,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);
|
||||
//CombatManager.handleRetaliate(this, attacker);
|
||||
}
|
||||
|
||||
return newHealth - oldHealth;
|
||||
@@ -1291,7 +1291,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
|
||||
}
|
||||
if (value < 0f && !fromCost) {
|
||||
this.cancelOnTakeDamage();
|
||||
CombatManager.handleRetaliate(this, attacker);
|
||||
//CombatManager.handleRetaliate(this, attacker);
|
||||
}
|
||||
return newMana - oldMana;
|
||||
}
|
||||
@@ -1338,7 +1338,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
|
||||
}
|
||||
if (value < 0f && !fromCost) {
|
||||
this.cancelOnTakeDamage();
|
||||
CombatManager.handleRetaliate(this, attacker);
|
||||
//CombatManager.handleRetaliate(this, attacker);
|
||||
}
|
||||
return newStamina - oldStamina;
|
||||
}
|
||||
@@ -1373,7 +1373,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
|
||||
}
|
||||
if (oldMana > newMana && !fromCost) {
|
||||
this.cancelOnTakeDamage();
|
||||
CombatManager.handleRetaliate(this, attacker);
|
||||
//CombatManager.handleRetaliate(this, attacker);
|
||||
}
|
||||
return newMana - oldMana;
|
||||
}
|
||||
@@ -1408,7 +1408,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
|
||||
}
|
||||
if (oldStamina > newStamina && !fromCost) {
|
||||
this.cancelOnTakeDamage();
|
||||
CombatManager.handleRetaliate(this, attacker);
|
||||
//CombatManager.handleRetaliate(this, attacker);
|
||||
}
|
||||
return newStamina - oldStamina;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user