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

#3323: New perspectives, fixed deadlock freeze

Browse source
This commit is contained in:
magenoxx 2017-05-13 18:57:33 +03:00
parent 53228d2389
commit 2a366c4022
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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);
}
}
}