github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 11:09:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3234 from spjspj/master

Browse source 
Fix for the audio trigger of 'Player joined the table' not being fired.
This commit is contained in:
spjspj 2017-04-25 18:18:25 +10:00 committed by GitHub
commit fdd55e70e0
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.java
View file

@ -437,6 +437,7 @@ class UpdateSeatsTask extends SwingWorker<Void, TableView> {
AudioManager.playPlayerJoinedTable(); AudioManager.playPlayerJoinedTable();
} else { } else {
MageTray.instance.displayMessage("A player left your game."); MageTray.instance.displayMessage("A player left your game.");
AudioManager.playPlayerLeft();
} }
MageTray.instance.blink(); MageTray.instance.blink();
} }
@ -450,11 +451,13 @@ class UpdateSeatsTask extends SwingWorker<Void, TableView> {
int playerCount = 0; int playerCount = 0;
if (tableView != null) { if (tableView != null) {
for (SeatView seatView : tableView.getSeats()) { for (SeatView seatView : tableView.getSeats()) {
if (seatView.getPlayerId() != null && seatView.getPlayerType().equals("Human")) { if (seatView.getPlayerId() != null) {
if (seatView.getPlayerType().toString().equals("Human")) {
playerCount++; playerCount++;
} }
} }
} }
}
return playerCount; return playerCount;
} }