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

Some stylistic fixes for code review

Browse source
This commit is contained in:
Devon Richards 2017-06-21 23:51:59 -05:00
parent f0b8fd8eec
commit 63382aed93
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
View file

@ -125,7 +125,9 @@ public class HumanPlayer extends PlayerImpl {
} }
protected boolean isExecutingMacro() { protected boolean isExecutingMacro() {
return !actionQueue.isEmpty() || (actionIterations > 0 && !actionQueueSaved.isEmpty()); return !recordingMacro
&& (!actionQueue.isEmpty()
|| (actionIterations > 0 && !actionQueueSaved.isEmpty()));
} }
protected boolean pullResponseFromQueue(Game game) { protected boolean pullResponseFromQueue(Game game) {
@ -152,7 +154,10 @@ public class HumanPlayer extends PlayerImpl {
} }
protected void waitForResponse(Game game) { protected void waitForResponse(Game game) {
if(!recordingMacro && pullResponseFromQueue(game)) return; if (isExecutingMacro()) {
pullResponseFromQueue(game);
return;
}
response.clear(); response.clear();
logger.debug("Waiting response from player: " + getId()); logger.debug("Waiting response from player: " + getId());
game.resumeTimer(getTurnControlledBy()); game.resumeTimer(getTurnControlledBy());