From f9491164eb31076a9ae4a99c65bb2e872622f644 Mon Sep 17 00:00:00 2001 From: Quackster Date: Sat, 3 Sep 2022 15:56:19 +1000 Subject: [PATCH 1/2] Remove hotel specific code --- .../java/org/alexdev/havana/game/room/RoomManager.java | 8 -------- .../havana/util/config/writer/GameConfigWriter.java | 1 - 2 files changed, 9 deletions(-) diff --git a/Havana-Server/src/main/java/org/alexdev/havana/game/room/RoomManager.java b/Havana-Server/src/main/java/org/alexdev/havana/game/room/RoomManager.java index f2d9400..d83319e 100644 --- a/Havana-Server/src/main/java/org/alexdev/havana/game/room/RoomManager.java +++ b/Havana-Server/src/main/java/org/alexdev/havana/game/room/RoomManager.java @@ -23,14 +23,6 @@ public class RoomManager { public RoomManager() { this.roomMap = new ConcurrentHashMap<>(); 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")); - } - } } /** diff --git a/Havana-Server/src/main/java/org/alexdev/havana/util/config/writer/GameConfigWriter.java b/Havana-Server/src/main/java/org/alexdev/havana/util/config/writer/GameConfigWriter.java index 5741827..c42d405 100644 --- a/Havana-Server/src/main/java/org/alexdev/havana/util/config/writer/GameConfigWriter.java +++ b/Havana-Server/src/main/java/org/alexdev/havana/util/config/writer/GameConfigWriter.java @@ -137,7 +137,6 @@ public class GameConfigWriter implements ConfigWriter { config.put("chat.spam.count", "10"); config.put("walk.spam.count", "10"); - config.put("stout.room", "0"); config.put("messenger.enable.official.update.speed", "false"); for (var set : CommandManager.getCommands()) { From dd51da410ae167b7a91e9e233b911653715ef475 Mon Sep 17 00:00:00 2001 From: Quackster Date: Sat, 3 Sep 2022 15:56:36 +1000 Subject: [PATCH 2/2] Set default group guide id to 1 for groups.sql --- .../org/alexdev/havana/util/config/writer/GameConfigWriter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Havana-Server/src/main/java/org/alexdev/havana/util/config/writer/GameConfigWriter.java b/Havana-Server/src/main/java/org/alexdev/havana/util/config/writer/GameConfigWriter.java index c42d405..8430b29 100644 --- a/Havana-Server/src/main/java/org/alexdev/havana/util/config/writer/GameConfigWriter.java +++ b/Havana-Server/src/main/java/org/alexdev/havana/util/config/writer/GameConfigWriter.java @@ -105,7 +105,7 @@ public class GameConfigWriter implements ConfigWriter { config.put("delete.iplogs.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.completion.minutes", "4320");