External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-21 11:02:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: code clean in turn

Browse source
This commit is contained in:
Oleg Agafonov 2025-02-22 14:56:06 +04:00
parent b82c6010c2
commit 869cf83fd6
2 changed files with 15 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3814,7 +3814,7 @@ public abstract class GameImpl implements Game {
@Override @Override
public boolean endTurn(Ability source) { public boolean endTurn(Ability source) {
getTurn().endTurn(this, getActivePlayerId(), source); getTurn().endTurn(this, source);
return true; return true;
} }

34
Mage/src/main/java/mage/game/turn/Turn.java
View file

@ -53,13 +53,6 @@ public class Turn implements Serializable {
} }
public TurnPhase getPhaseType() {
if (currentPhase != null) {
return currentPhase.getType();
}
return null;
}
public Phase getPhase() { public Phase getPhase() {
return currentPhase; return currentPhase;
} }
@ -85,14 +78,9 @@ public class Turn implements Serializable {
} }
/** /**
* @param game
* @param activePlayer
* @return true if turn is skipped * @return true if turn is skipped
*/ */
public boolean play(Game game, Player activePlayer) { public boolean play(Game game, Player activePlayer) {
// uncomment this to trace triggered abilities and/or continous effects
// TraceUtil.traceTriggeredAbilities(game);
// game.getState().getContinuousEffects().traceContinuousEffects(game);
activePlayer.becomesActivePlayer(); activePlayer.becomesActivePlayer();
this.setDeclareAttackersStepStarted(false); this.setDeclareAttackersStepStarted(false);
if (game.isPaused() || game.checkIfGameIsOver()) { if (game.isPaused() || game.checkIfGameIsOver()) {
@ -150,7 +138,12 @@ public class Turn implements Serializable {
game.saveState(false); game.saveState(false);
//20091005 - 500.8 //20091005 - 500.8
while (playExtraPhases(game, phase.getType())) ; while (true) {
// TODO: make sure it work fine (without freeze) on game errors inside extra phases
if (!playExtraPhases(game, phase.getType())) {
break;
}
}
} }
return false; return false;
} }
@ -158,7 +151,6 @@ public class Turn implements Serializable {
public void resumePlay(Game game, boolean wasPaused) { public void resumePlay(Game game, boolean wasPaused) {
activePlayerId = game.getActivePlayerId(); activePlayerId = game.getActivePlayerId();
Player activePlayer = game.getPlayer(activePlayerId); Player activePlayer = game.getPlayer(activePlayerId);
UUID priorityPlayerId = game.getPriorityPlayerId();
TurnPhase needPhaseType = game.getTurnPhaseType(); TurnPhase needPhaseType = game.getTurnPhaseType();
PhaseStep needStepType = game.getTurnStepType(); PhaseStep needStepType = game.getTurnStepType();
@ -259,10 +251,16 @@ public class Turn implements Serializable {
} }
} }
/**
* Play additional phases one by one
*
* @return false to finish
*/
private boolean playExtraPhases(Game game, TurnPhase afterPhase) { private boolean playExtraPhases(Game game, TurnPhase afterPhase) {
while (true) { while (true) {
TurnMod extraPhaseMod = game.getState().getTurnMods().useNextExtraPhase(activePlayerId, afterPhase); TurnMod extraPhaseMod = game.getState().getTurnMods().useNextExtraPhase(activePlayerId, afterPhase);
if (extraPhaseMod == null) { if (extraPhaseMod == null) {
// no more extra phases
return false; return false;
} }
TurnPhase extraPhase = extraPhaseMod.getExtraPhase(); TurnPhase extraPhase = extraPhaseMod.getExtraPhase();
@ -316,12 +314,8 @@ public class Turn implements Serializable {
/** /**
* Used for some spells with end turn effect (e.g. Time Stop). * Used for some spells with end turn effect (e.g. Time Stop).
*
* @param game
* @param activePlayerId
* @param source
*/ */
public void endTurn(Game game, UUID activePlayerId, Ability source) { public void endTurn(Game game, Ability source) {
// Ending the turn this way (Time Stop) means the following things happen in order: // Ending the turn this way (Time Stop) means the following things happen in order:
setEndTurnRequested(true); setEndTurnRequested(true);
@ -403,6 +397,6 @@ public class Turn implements Serializable {
.map(p -> String.valueOf(p.getLife())) .map(p -> String.valueOf(p.getLife()))
.collect(Collectors.joining(" - ")); .collect(Collectors.joining(" - "));
game.fireStatusEvent(infoTurn + " " + infoLife, true, false); game.fireStatusEvent(infoTurn + " (" + infoLife + ")", true, false);
} }
} }