mirrors/Havana
1
Fork 0
mirror of https://github.com/Quackster/Havana.git synced 2025-07-03 13:17:46 +00:00
Code Activity

Merge branch 'develop'

Browse source
This commit is contained in:
Quackster 2022-09-03 15:56:41 +10:00
commit c9c1cdc8e4
2 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Havana-Server/src/main/java/org/alexdev/havana/game/room/RoomManager.java
View file

@ -23,14 +23,6 @@ public class RoomManager {
public RoomManager() { public RoomManager() {
this.roomMap = new ConcurrentHashMap<>(); this.roomMap = new ConcurrentHashMap<>();
this.roomEntryBadges = BadgeDao.getRoomBadges(); this.roomEntryBadges = BadgeDao.getRoomBadges();
int stoutRoomId = GameConfiguration.getInstance().getInteger("stout.room");
if (stoutRoomId > 0) {
if (!this.roomEntryBadges.containsKey(stoutRoomId)) {
this.roomEntryBadges.put(stoutRoomId, List.of("STOUT"));
}
}
} }
/** /**

3
Havana-Server/src/main/java/org/alexdev/havana/util/config/writer/GameConfigWriter.java
View file

@ -105,7 +105,7 @@ public class GameConfigWriter implements ConfigWriter {
config.put("delete.iplogs.after.x.age", "2592000"); config.put("delete.iplogs.after.x.age", "2592000");
config.put("delete.tradelogs.after.x.age", "2592000"); config.put("delete.tradelogs.after.x.age", "2592000");
config.put("guides.group.id", "0"); config.put("guides.group.id", "1");
config.put("guide.search.timeout.minutes", "5"); config.put("guide.search.timeout.minutes", "5");
config.put("guide.completion.minutes", "4320"); config.put("guide.completion.minutes", "4320");
@ -137,7 +137,6 @@ public class GameConfigWriter implements ConfigWriter {
config.put("chat.spam.count", "10"); config.put("chat.spam.count", "10");
config.put("walk.spam.count", "10"); config.put("walk.spam.count", "10");
config.put("stout.room", "0");
config.put("messenger.enable.official.update.speed", "false"); config.put("messenger.enable.official.update.speed", "false");
for (var set : CommandManager.getCommands()) { for (var set : CommandManager.getCommands()) {