ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing changed constructor signatures

Browse Source
This commit is contained in:
Christian 'ketura' McCarty
2021-11-16 09:16:00 -06:00
parent 952e9a66b3
commit 931c1d09d2
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/builder/ServerBuilder.java
View File

@@ -89,7 +89,8 @@ public class ServerBuilder {
extract(objectMap, CardSets.class)));
objectMap.put(ChatServer.class, new ChatServer(
extract(objectMap, IgnoreDAO.class)));
extract(objectMap, IgnoreDAO.class),
extract(objectMap, PlayerDAO.class)));
objectMap.put(LotroServer.class,
new LotroServer(

9
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/chat/ChatServer.java
View File

@@ -3,6 +3,7 @@ package com.gempukku.lotro.chat;
import com.gempukku.lotro.AbstractServer;
import com.gempukku.lotro.PrivateInformationException;
import com.gempukku.lotro.db.IgnoreDAO;
import com.gempukku.lotro.db.PlayerDAO;
import java.util.Map;
import java.util.Set;
@@ -10,14 +11,16 @@ import java.util.concurrent.ConcurrentHashMap;
public class ChatServer extends AbstractServer {
private IgnoreDAO ignoreDAO;
private PlayerDAO playerDAO;
private Map<String, ChatRoomMediator> _chatRooms = new ConcurrentHashMap<String, ChatRoomMediator>();
public ChatServer(IgnoreDAO ignoreDAO) {
public ChatServer(IgnoreDAO ignoreDAO, PlayerDAO playerDAO) {
this.ignoreDAO = ignoreDAO;
this.playerDAO = playerDAO;
}
public ChatRoomMediator createChatRoom(String name, boolean muteJoinPartMessages, int secondsTimeoutPeriod, boolean allowIncognito, String welcomeMessage) {
ChatRoomMediator chatRoom = new ChatRoomMediator(ignoreDAO, name, muteJoinPartMessages, secondsTimeoutPeriod, allowIncognito, welcomeMessage);
ChatRoomMediator chatRoom = new ChatRoomMediator(ignoreDAO, playerDAO, name, muteJoinPartMessages, secondsTimeoutPeriod, allowIncognito, welcomeMessage);
try {
chatRoom.sendMessage("System", "Welcome to room: " + name, true);
} catch (PrivateInformationException exp) {
@@ -30,7 +33,7 @@ public class ChatServer extends AbstractServer {
}
public ChatRoomMediator createPrivateChatRoom(String name, boolean muteJoinPartMessages, Set<String> allowedUsers, int secondsTimeoutPeriod) {
ChatRoomMediator chatRoom = new ChatRoomMediator(ignoreDAO, name, muteJoinPartMessages, secondsTimeoutPeriod, allowedUsers, false);
ChatRoomMediator chatRoom = new ChatRoomMediator(ignoreDAO, playerDAO, name, muteJoinPartMessages, secondsTimeoutPeriod, allowedUsers, false);
try {
chatRoom.sendMessage("System", "Welcome to private room: " + name, true);
} catch (PrivateInformationException exp) {