External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 04:52:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added some new sound files (PlayerLost, PlayerWon, PlayerSubmittedDeck, PlayerLeft).

Browse source
This commit is contained in:
LevelX2 2013-08-31 19:00:38 +02:00
parent 2b916a5dfb
commit 182839d41a
12 changed files with 73 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Mage.Server/src/main/java/mage/server/ChatManager.java
View file

@ -32,6 +32,7 @@ import mage.view.ChatMessage.MessageColor;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import mage.view.ChatMessage.SoundToPlay;
/**
*
@ -75,6 +76,10 @@ public class ChatManager {
chatSessions.get(chatId).broadcast(userName, message, color, withTime);
}
public void broadcast(UUID chatId, String userName, String message, MessageColor color, boolean withTime, SoundToPlay soundToPlay) {
chatSessions.get(chatId).broadcast(userName, message, color, withTime, soundToPlay);
}
/**
*
* use mainly for announcing that a user connection was lost or that a user has reconnected

7
Mage.Server/src/main/java/mage/server/ChatSession.java
View file

@ -37,6 +37,7 @@ import java.util.concurrent.ConcurrentHashMap;
import mage.interfaces.callback.ClientCallback;
import mage.view.ChatMessage;
import mage.view.ChatMessage.MessageColor;
import mage.view.ChatMessage.SoundToPlay;
import org.apache.log4j.Logger;
/**
@ -89,6 +90,10 @@ public class ChatSession {
}
public void broadcast(String userName, String message, MessageColor color, boolean withTime) {
broadcast(userName, message, color, withTime, null);
}
public void broadcast(String userName, String message, MessageColor color, boolean withTime, SoundToPlay soundToPlay) {
if (!message.isEmpty()) {
Calendar cal = new GregorianCalendar();
final String msg = message;
@ -98,7 +103,7 @@ public class ChatSession {
for (UUID userId: clients.keySet()) {
User user = UserManager.getInstance().getUser(userId);
if (user != null) {
user.fireCallback(new ClientCallback("chatMessage", chatId, new ChatMessage(username, msg, time, color)));
user.fireCallback(new ClientCallback("chatMessage", chatId, new ChatMessage(username, msg, time, color, soundToPlay)));
}
else {
kill(userId, User.DisconnectReason.CleaningUp);

6
Mage.Server/src/main/java/mage/server/tournament/TournamentController.java
View file

@ -45,13 +45,13 @@ import mage.game.match.MatchOptions;
import mage.game.tournament.Tournament;
import mage.game.tournament.TournamentPairing;
import mage.game.tournament.TournamentPlayer;
import mage.players.Player;
import mage.server.ChatManager;
import mage.server.TableManager;
import mage.server.UserManager;
import mage.server.game.GamesRoomManager;
import mage.server.util.ThreadExecutor;
import mage.view.ChatMessage.MessageColor;
import mage.view.ChatMessage.SoundToPlay;
import mage.view.TournamentView;
import org.apache.log4j.Logger;
@ -240,7 +240,7 @@ public class TournamentController {
TournamentPlayer player = tournament.getPlayer(playerId);
if (player != null && !player.hasQuit()) {
tournamentSessions.get(playerId).submitDeck(deck);
ChatManager.getInstance().broadcast(chatId, "", player.getPlayer().getName() + " has submitted his tournament deck", MessageColor.BLACK);
ChatManager.getInstance().broadcast(chatId, "", player.getPlayer().getName() + " has submitted his tournament deck", MessageColor.BLACK, true, SoundToPlay.PlayerSubmittedDeck);
}
}
}
@ -267,7 +267,7 @@ public class TournamentController {
if (playerId != null) {
TournamentPlayer player = tournament.getPlayer(playerId);
if (player != null) {
ChatManager.getInstance().broadcast(chatId, "", player.getPlayer().getName() + " has quit the tournament", MessageColor.BLACK);
ChatManager.getInstance().broadcast(chatId, "", player.getPlayer().getName() + " has quit the tournament", MessageColor.BLACK, true, SoundToPlay.PlayerLeft);
String info;
if (tournament.isDoneConstructing()) {
info = new StringBuilder("during round ").append(tournament.getRounds().size()).toString();