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

Fix another problem with Thespian's Stage copying itself and add a test.

Browse Source
This commit is contained in:
Myrd
2016-12-22 22:30:34 +00:00
parent 4efc738813
commit a2aa3ccc06
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/card/CardState.java
View File

@@ -102,6 +102,10 @@ public class CardState {
} }
} }
public final void setType(final CardType type0) { public final void setType(final CardType type0) {
if (type0 == type) {
// Logic below would incorrectly clear the type if it's the same object.
return;
}
if (type0.isEmpty() && type.isEmpty()) { return; } if (type0.isEmpty() && type.isEmpty()) { return; }
type.clear(); type.clear();
type.addAll(type0); type.addAll(type0);

5
forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulatorTest.java
View File

@@ -568,6 +568,7 @@ public class GameSimulatorTest extends TestCase {
addCard("Swamp", p); addCard("Swamp", p);
addCard("Swamp", p); addCard("Swamp", p);
Card thespian = addCard("Thespian's Stage", p); Card thespian = addCard("Thespian's Stage", p);
assertTrue(thespian.isLand());
game.getPhaseHandler().devModeSet(PhaseType.MAIN2, p); game.getPhaseHandler().devModeSet(PhaseType.MAIN2, p);
game.getAction().checkStateEffects(true); game.getAction().checkStateEffects(true);
@@ -578,6 +579,8 @@ public class GameSimulatorTest extends TestCase {
GameSimulator sim = createSimulator(game, p); GameSimulator sim = createSimulator(game, p);
sim.simulateSpellAbility(sa); sim.simulateSpellAbility(sa);
Game simGame = sim.getSimulatedGameState(); Game simGame = sim.getSimulatedGameState();
assertNotNull(gameStateToString(simGame), findCardWithName(simGame, "Thespian's Stage")); Card thespianSim = findCardWithName(simGame, "Thespian's Stage");
assertNotNull(gameStateToString(simGame), thespianSim);
assertTrue(thespianSim.isLand());
} }
} }