Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor MagicChangeExtraTurnsAction -> ChangeExtraTurnsAction

master
ShawnieBoy 2015-04-13 08:55:19 +01:00
parent 3d9d799199
commit 146beee29d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/magic/model/action/MagicChangeExtraTurnsAction.java → src/magic/model/action/ChangeExtraTurnsAction.java
View File

@ -3,12 +3,12 @@ package magic.model.action;
import magic.model.MagicGame;
import magic.model.MagicPlayer;
public class MagicChangeExtraTurnsAction extends MagicAction {
public class ChangeExtraTurnsAction extends MagicAction {
private final MagicPlayer player;
private final int amount;
public MagicChangeExtraTurnsAction(final MagicPlayer player,final int amount) {
public ChangeExtraTurnsAction(final MagicPlayer player,final int amount) {
this.player=player;
this.amount=amount;

4
src/magic/model/phase/MagicCleanupPhase.java
View File

@ -3,7 +3,7 @@ package magic.model.phase;
import magic.model.MagicGame;
import magic.model.MagicPlayer;
import magic.model.phase.MagicPhaseType;
import magic.model.action.MagicChangeExtraTurnsAction;
import magic.model.action.ChangeExtraTurnsAction;
import magic.model.action.MagicCleanupPlayerAction;
import magic.model.action.MagicCleanupTurnStaticsAction;
import magic.model.action.MagicCleanupTurnTriggersAction;
@ -46,7 +46,7 @@ public class MagicCleanupPhase extends MagicPhase {
game.doAction(new MagicPayDelayedCostsAction(turnPlayer));
}
if (turnPlayer.getExtraTurns()>0) {
game.doAction(new MagicChangeExtraTurnsAction(turnPlayer,-1));
game.doAction(new ChangeExtraTurnsAction(turnPlayer,-1));
final String playerName = turnPlayer.getName();
game.logMessage(turnPlayer,playerName + " takes an extra turn.");
} else {