external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

commit GameEntity i forgot

Browse Source
This commit is contained in:
Hanmac
2016-12-29 12:47:28 +00:00
parent f891446b8b
commit 21a34b8f3c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-game/src/main/java/forge/game/GameEntity.java
View File

@@ -55,7 +55,7 @@ public abstract class GameEntity extends GameObject implements IIdentifiable {
getView().updateName(this); getView().updateName(this);
} }
public boolean addDamage(final int damage, final Card source) { public int addDamage(final int damage, final Card source) {
int damageToDo = damage; int damageToDo = damage;
damageToDo = replaceDamage(damageToDo, source, false); damageToDo = replaceDamage(damageToDo, source, false);
@@ -64,13 +64,13 @@ public abstract class GameEntity extends GameObject implements IIdentifiable {
return addDamageAfterPrevention(damageToDo, source, false); return addDamageAfterPrevention(damageToDo, source, false);
} }
public boolean addDamageWithoutPrevention(final int damage, final Card source) { public int addDamageWithoutPrevention(final int damage, final Card source) {
int damageToDo = replaceDamage(damage, source, false); int damageToDo = replaceDamage(damage, source, false);
return addDamageAfterPrevention(damageToDo, source, false); return addDamageAfterPrevention(damageToDo, source, false);
} }
// This function handles damage after replacement and prevention effects are applied // This function handles damage after replacement and prevention effects are applied
public abstract boolean addDamageAfterPrevention(final int damage, final Card source, final boolean isCombat); public abstract int addDamageAfterPrevention(final int damage, final Card source, final boolean isCombat);
// This should be also usable by the AI to forecast an effect (so it must // This should be also usable by the AI to forecast an effect (so it must
// not change the game state) // not change the game state)