github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed priority bug

Browse source
This commit is contained in:
BetaSteward 2010-05-07 04:01:54 +00:00
parent aa8bae1399
commit 65ed00328e
1 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
Mage/src/mage/game/GameImpl.java
View file

@ -30,7 +30,6 @@ package mage.game;
import mage.game.stack.SpellStack;
import java.io.Serializable;
import java.net.URLClassLoader;
import java.util.Collection;
import java.util.Random;
import java.util.Stack;
@ -301,36 +300,43 @@ public abstract class GameImpl implements Game, Serializable {
@Override
public void playPriority(UUID activePlayerId) {
state.getPlayers().resetPassed();
while (!isGameOver()) {
while (!isGameOver()) {
int stackSize = state.getStack().size();
state.getPlayers().resetPriority();
for (Player player: getPlayerList(activePlayerId)) {
state.setPriorityPlayerId(player.getId());
while (!player.isPassed() && !isGameOver()) {
checkStateAndTriggered();
if (isGameOver())
return;
player.priority(this);
if (isGameOver())
return;
applyEffects();
saveState();
}
for (Player player: getPlayerList(activePlayerId)) {
state.setPriorityPlayerId(player.getId());
while (!player.isPassed() && !isGameOver()) {
checkStateAndTriggered();
if (isGameOver()) return;
// resetPassed should be called if player performs any action
player.priority(this);
if (isGameOver()) return;
applyEffects();
saveState();
}
if (isGameOver()) return;
if (allPassed()) {
if (!state.getStack().isEmpty()) {
//20091005 - 115.4
state.getStack().resolve(this);
applyEffects();
state.getPlayers().resetPassed();
saveState();
break;
}
return;
}
//no items have been added to the stack
if (isGameOver() || stackSize == state.getStack().size())
break;
}
if (isGameOver() || state.getStack().isEmpty())
break;
//20091005 - 115.4
state.getStack().resolve(this);
applyEffects();
saveState();
}
}
protected boolean allPassed() {
for (Player player: state.getPlayers().values()) {
if (!player.isPassed())
return false;
}
return true;
}
@Override
public void emptyManaPools() {
if (!replaceEvent(new GameEvent(GameEvent.EventType.EMPTY_MANA_POOLS, null, null, null))) {