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

- Removed obsolete null checks.

Browse Source
This commit is contained in:
Sloth
2012-10-29 10:16:20 +00:00
parent ffd85cb1c8
commit abfd526ede
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
View File

@@ -1660,10 +1660,7 @@ public final class AbilityFactoryChangeZone {
} }
} }
if (tgt != null) { tgt.resetTargets();
tgt.resetTargets();
}
List<Card> list = CardLists.getValidCards(Singletons.getModel().getGame().getCardsIn(origin), tgt.getValidTgts(), ai, source); List<Card> list = CardLists.getValidCards(Singletons.getModel().getGame().getCardsIn(origin), tgt.getValidTgts(), ai, source);
if (params.containsKey("AITgts")) { if (params.containsKey("AITgts")) {
list = CardLists.getValidCards(list, params.get("AITgts"), sa.getActivatingPlayer(), source); list = CardLists.getValidCards(list, params.get("AITgts"), sa.getActivatingPlayer(), source);

8
src/main/java/forge/game/player/Player.java
View File

@@ -1297,11 +1297,9 @@ public abstract class Player extends GameEntity implements Comparable<Player> {
} }
} }
if (game != null) { this.setLastDrawnCard(c);
this.setLastDrawnCard(c); c.setDrawnThisTurn(true);
c.setDrawnThisTurn(true); this.numDrawnThisTurn++;
this.numDrawnThisTurn++;
}
// Miracle draws // Miracle draws
if (this.numDrawnThisTurn == 1) { if (this.numDrawnThisTurn == 1) {