Merge changes

This commit is contained in:
magenoxx 2014-05-03 11:00:05 +05:30
commit 9f2466f42f
63 changed files with 1515 additions and 421 deletions

View file

@ -412,7 +412,7 @@ public class GameController implements GameCallback {
.append(ConfigSettings.getInstance().getMaxSecondsIdle())
.append(" seconds ) - Auto concede.");
ChatManager.getInstance().broadcast(chatId, "", sb.toString() , MessageColor.BLACK, true, MessageType.STATUS);
concede(userId);
game.idleTimeout(getPlayerId(userId));
}
}