Merge origin/master

This commit is contained in:
LevelX2 2017-04-25 15:47:50 +02:00
commit 9a21b55d39

View file

@ -54,6 +54,7 @@ import mage.client.util.GUISizeHelper;
import mage.client.util.audio.AudioManager;
import mage.client.util.gui.TableUtil;
import mage.client.util.gui.countryBox.CountryCellRenderer;
import mage.players.PlayerType;
import mage.remote.Session;
import mage.view.SeatView;
import mage.view.TableView;
@ -437,6 +438,7 @@ class UpdateSeatsTask extends SwingWorker<Void, TableView> {
AudioManager.playPlayerJoinedTable();
} else {
MageTray.instance.displayMessage("A player left your game.");
AudioManager.playPlayerLeft();
}
MageTray.instance.blink();
}
@ -450,7 +452,7 @@ class UpdateSeatsTask extends SwingWorker<Void, TableView> {
int playerCount = 0;
if (tableView != null) {
for (SeatView seatView : tableView.getSeats()) {
if (seatView.getPlayerId() != null && seatView.getPlayerType().equals("Human")) {
if (seatView.getPlayerId() != null && seatView.getPlayerType() == PlayerType.HUMAN) {
playerCount++;
}
}