github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-24 11:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Improved game is infinite loop check to ask players only if some kind of iteration is recognized.

Browse source
This commit is contained in:
LevelX2 2017-06-05 12:27:59 +02:00
parent 2728a274ca
commit 3c6ede7407
2 changed files with 185 additions and 148 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Mage.Tests/src/test/java/org/mage/test/game/ends/GameIsADrawTest.java
View file

@ -119,4 +119,34 @@ public class GameIsADrawTest extends CardTestPlayerBase {
}
/**
* Check that a simple triggered ability does not trigger the infinite loop
* request to players
*/
@Test
public void GameDrawByInfiniteLoopNot() {
addCard(Zone.BATTLEFIELD, playerA, "Plains", 43);
// Whenever a creature enters the battlefield under your control, you gain life equal to its toughness.
addCard(Zone.BATTLEFIELD, playerA, "Angelic Chorus", 1); // Enchantment {5}
// Create X 4/4 white Angel creature tokens with flying.
// Miracle (You may cast this card for its miracle cost when you draw it if it's the first card you drew this turn.)
addCard(Zone.HAND, playerA, "Entreat the Angels", 1); // Sorcery {X}{X}{W}{W}{W}
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Entreat the Angels");
setChoice(playerA, "X=20");
setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute();
assertPermanentCount(playerA, "Angel", 20);
Assert.assertFalse("Game should not have ended.", currentGame.hasEnded());
assertLife(playerA, 100);
Assert.assertFalse("No inifinite loop detected, game has be no draw.", currentGame.isADraw());
}
}

31
Mage/src/main/java/mage/game/GameImpl.java
View file

@ -177,6 +177,8 @@ public abstract class GameImpl implements Game, Serializable {
protected PlayerList playerList;
private int infiniteLoopCounter; // used to check if the game is in an infinite loop
private int lastNumberOfAbilitiesOnTheStack; // used to check how long no new ability was put to stack
private final LinkedList<UUID> stackObjectsCheck = new LinkedList<>(); // used to check if different sources used the stack
// used to set the counters a permanent adds the battlefield (if no replacement effect is used e.g. Persist)
protected Map<UUID, Counters> enterWithCounters = new HashMap<>();
@ -1289,7 +1291,6 @@ public abstract class GameImpl implements Game, Serializable {
}
if (allPassed()) {
if (!state.getStack().isEmpty()) {
checkInfiniteLoop();
//20091005 - 115.4
resolve();
applyEffects();
@ -1298,7 +1299,6 @@ public abstract class GameImpl implements Game, Serializable {
resetShortLivingLKI();
break;
} else {
infiniteLoopCounter = 0;
resetLKI();
return;
}
@ -1346,6 +1346,7 @@ public abstract class GameImpl implements Game, Serializable {
if (top != null) {
state.getStack().remove(top); // seems partly redundant because move card from stack to grave is already done and the stack removed
rememberLKI(top.getSourceId(), Zone.STACK, top);
checkInfiniteLoop(top.getSourceId());
if (!getTurn().isEndTurnRequested()) {
while (state.hasSimultaneousEvents()) {
state.handleSimultaneousEvent(this);
@ -1357,20 +1358,19 @@ public abstract class GameImpl implements Game, Serializable {
/**
* This checks if the stack gets filled iterated, without ever getting empty
* If the defined number of iterations is reached, the players in range of
* the stackObject get asked to confirm a draw. If they do, all confirming
* players get set to a draw.
* If the defined number of iterations with not more than 4 different
* sourceIds for the removed stack Objects is reached, the players in range
* of the stackObject get asked to confirm a draw. If they do, all
* confirming players get set to a draw.
*
* Possible to improve: check that always the same set of stackObjects are
* again aand again on the stack
* @param removedStackObjectSourceId
*/
protected void checkInfiniteLoop() {
if (getStack().size() < 4) { // to prevent that this also pops up, if e.g. 20 triggers resolve at once
protected void checkInfiniteLoop(UUID removedStackObjectSourceId) {
if (stackObjectsCheck.contains(removedStackObjectSourceId)
&& getStack().size() >= lastNumberOfAbilitiesOnTheStack) {
infiniteLoopCounter++;
if (infiniteLoopCounter > 15) {
StackObject stackObject = getStack().getFirst();
if (stackObject != null) {
Player controller = getPlayer(stackObject.getControllerId());
Player controller = getPlayer(getControllerId(removedStackObjectSourceId));
if (controller != null) {
for (UUID playerId : getState().getPlayersInRange(controller.getId(), this)) {
Player player = getPlayer(playerId);
@ -1389,8 +1389,13 @@ public abstract class GameImpl implements Game, Serializable {
}
}
}
} else {
stackObjectsCheck.add(removedStackObjectSourceId);
if (stackObjectsCheck.size() > 4) {
stackObjectsCheck.removeFirst();
}
}
lastNumberOfAbilitiesOnTheStack = getStack().size();
}
protected boolean allPassed() {
@ -2618,6 +2623,8 @@ public abstract class GameImpl implements Game, Serializable {
public void resetLKI() {
lki.clear();
lkiExtended.clear();
infiniteLoopCounter = 0;
stackObjectsCheck.clear();
}
@Override