Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

* Server - Some changes to user / match / table handling.

Browse source
This commit is contained in:
LevelX2 2014-09-07 02:28:47 +02:00
parent 5b34b46eac
commit c3c77e3974
13 changed files with 164 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,6 +31,7 @@ package mage.server;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashSet;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import mage.interfaces.callback.ClientCallback;
@ -52,6 +53,7 @@ public class ChatSession {
private final Date createTime;
private final String info;
private final DateFormat timeFormatter = SimpleDateFormat.getTimeInstance(SimpleDateFormat.SHORT);
private final HashSet<UUID> clientsToRemove = new HashSet<>();
public ChatSession(String info) {
chatId = UUID.randomUUID();
@ -148,7 +150,8 @@ public class ChatSession {
}
public void broadcast(String userName, String message, MessageColor color, boolean withTime, MessageType messageType, SoundToPlay soundToPlay) {
if (!message.isEmpty()) {
if (!message.isEmpty()) {
boolean remove = false;
final String msg = message;
final String time = (withTime ? timeFormatter.format(new Date()):"");
final String username = userName;
@ -160,8 +163,16 @@ public class ChatSession {
}
else {
logger.error("User not found but connected to chat - userId: " + userId + " chatId: " + chatId);
clientsToRemove.add(userId);
remove = true;
}
}
if (remove) {
for (UUID userIdToRemove: clientsToRemove) {
clients.remove(userIdToRemove);
}
clientsToRemove.clear();
}
}
}