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

- Cleanup and NPE protection.

Browse Source
This commit is contained in:
Sloth
2015-02-08 13:36:17 +00:00
parent 2c2139e3d6
commit b5dd19867a
3 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
forge-ai/src/main/java/forge/ai/simulation/GameCopier.java
View File

@@ -110,13 +110,15 @@ public class GameCopier {
}
}
}
newSa.setActivatingPlayer(map.map(origSa.getActivatingPlayer()));
if (origSa.usesTargeting()) {
for (GameObject o : origSa.getTargets().getTargets()) {
newSa.getTargets().add(map.map(o));
}
if (newSa != null) {
newSa.setActivatingPlayer(map.map(origSa.getActivatingPlayer()));
if (origSa.usesTargeting()) {
for (GameObject o : origSa.getTargets().getTargets()) {
newSa.getTargets().add(map.map(o));
}
}
newGame.getStack().add(newSa);
}
newGame.getStack().add(newSa);
}
}

9
forge-ai/src/main/java/forge/ai/simulation/GameSimulator.java
View File

@@ -162,13 +162,8 @@ public class GameSimulator {
return Integer.MIN_VALUE;
}
// TODO: Support multiple opponents.
Player opponent = null;
for (Player p : simGame.getPlayers()) {
if (p != aiPlayer) {
opponent = p;
break;
}
}
Player opponent = aiPlayer.getOpponent();
resolveStack(simGame, opponent);
// TODO: If this is during combat, before blockers are declared,