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

PlayerStartConditions is ok

Browse Source 
GameNew won't fetch supplier twice
This commit is contained in:
Maxmtg
2012-10-21 12:05:56 +00:00
parent f76638a227
commit a76a8a8ff6
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/forge/game/GameNew.java
View File

@@ -113,8 +113,9 @@ public class GameNew {
player.setStartingLife(p.getValue().getStartingLife()); player.setStartingLife(p.getValue().getStartingLife());
// what if I call it for AI player? // what if I call it for AI player?
PlayerZone bf = player.getZone(ZoneType.Battlefield); PlayerZone bf = player.getZone(ZoneType.Battlefield);
if (p.getValue().getCardsOnTable() != null) { Iterable<Card> onTable = p.getValue().getCardsOnTable();
for (final Card c : p.getValue().getCardsOnTable()) { if (onTable != null) {
for (final Card c : onTable) {
c.addController(player); c.addController(player);
c.setOwner(player); c.setOwner(player);
bf.add(c, false); bf.add(c, false);

2
src/main/java/forge/game/PlayerStartConditions.java
View File

@@ -22,7 +22,7 @@ public class PlayerStartConditions {
return startingLife; return startingLife;
} }
public final Iterable<Card> getCardsOnTable() { public final Iterable<Card> getCardsOnTable() {
return cardsOnTable.get(); return cardsOnTable == null ? null : cardsOnTable.get();
} }
public final void setStartingLife(int startingLife) { public final void setStartingLife(int startingLife) {