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

- Fixed a possible NPE caused by Scars of the Veteran.

Browse Source
This commit is contained in:
Sloth
2014-03-28 21:24:03 +00:00
parent 624133a1af
commit f1eb3b9251
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/player/Player.java
View File

@@ -913,8 +913,10 @@ public class Player extends GameEntity implements Comparable<Player> {
if (apiIsEffect) { if (apiIsEffect) {
List<Card> newCardsInCommand = this.getGame().getCardsIn(ZoneType.Command); List<Card> newCardsInCommand = this.getGame().getCardsIn(ZoneType.Command);
newCardsInCommand.removeAll(cardsInCommand); newCardsInCommand.removeAll(cardsInCommand);
if (!newCardsInCommand.isEmpty()) {
newCardsInCommand.get(0).setSVar("PreventedDamage", "Number$" + Integer.toString(dmgToBePrevented)); newCardsInCommand.get(0).setSVar("PreventedDamage", "Number$" + Integer.toString(dmgToBePrevented));
} }
}
this.subtractPreventNextDamageWithEffect(shieldSource, restDamage); this.subtractPreventNextDamageWithEffect(shieldSource, restDamage);
restDamage = restDamage - dmgToBePrevented; restDamage = restDamage - dmgToBePrevented;