github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-11 19:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3370 from magefree/feature/fix_new_perspectives_freeze

Browse source 
magenoxx branch - Feature/fix new perspectives freeze
This commit is contained in:
LevelX2 2017-05-14 06:47:08 +02:00 committed by GitHub
commit a045196572
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Common/pom.xml
View file

@ -61,7 +61,7 @@
</repositories>
<build>
<sourceDirectory>src</sourceDirectory>
<sourceDirectory>src/main/java</sourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

0
Mage.Common/src/mage/view/CardView.java → Mage.Common/src/main/java/mage/view/CardView.java
View file

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

@ -244,6 +244,7 @@ public class HumanPlayer extends PlayerImpl {
while (!abort) {
game.fireChooseChoiceEvent(playerId, replacementEffectChoice);
updateGameStatePriority("chooseEffect", game);
waitForResponse(game);
logger.debug("Choose effect: " + response.getString());
if (response.getString() != null) {

9
Mage.Server/src/main/java/mage/server/game/GameController.java
View file

@ -961,7 +961,7 @@ public class GameController implements GameCallback {
}
}
private synchronized void setupTimeout(final UUID playerId) {
private void setupTimeout(final UUID playerId) {
if (!useTimeout) {
return;
}
@ -973,9 +973,12 @@ public class GameController implements GameCallback {
);
}
private synchronized void cancelTimeout() {
private void cancelTimeout() {
logger.debug("cancelTimeout");
if (futureTimeout != null) {
futureTimeout.cancel(false);
synchronized (futureTimeout) {
futureTimeout.cancel(false);
}
}
}