diff --git a/LobbySystem/src/de/steamwar/lobby/LobbySystem.properties b/LobbySystem/src/de/steamwar/lobby/LobbySystem.properties index 4530aaaf..2d1f31c0 100644 --- a/LobbySystem/src/de/steamwar/lobby/LobbySystem.properties +++ b/LobbySystem/src/de/steamwar/lobby/LobbySystem.properties @@ -4,8 +4,12 @@ DATE=........ COMMAND_HELP_HEAD=§7---=== (§e{0}§7) ===--- # ServerTeamNPC's -NPC_CHAT_1 = §fHello, I''m {0} and I''m a(n) {1}§f. -NPC_CHAT_2 = §fWelcome on §eSteam§8War§f, have fun. +NPC_CHAT_0 = §fHello, I''m {0} and I''m a(n) {1}§f. +NPC_CHAT_1 = §fWelcome on §eSteam§8War§f, have fun. +NPC_CHAT_2 = §eSteam§8War§f was established in 2019. +NPC_CHAT_3 = &fBecome a part of our team by applying via our Discord server (https://steamwar.de/discord). +NPC_CHAT_4 = &fYou can develop your own buildserver features with our Lua script system. +NPC_CHAT_5 = &fThere are many secrets to discover in this lobby. # Portal Command PORTAL_COMMAND_LIST_HELP = §8/§7portal §elist §8- §7Lists all portals diff --git a/LobbySystem/src/de/steamwar/lobby/LobbySystem_de.properties b/LobbySystem/src/de/steamwar/lobby/LobbySystem_de.properties index 969270ee..f1c02955 100644 --- a/LobbySystem/src/de/steamwar/lobby/LobbySystem_de.properties +++ b/LobbySystem/src/de/steamwar/lobby/LobbySystem_de.properties @@ -4,8 +4,12 @@ DATE=........ COMMAND_HELP_HEAD=§7---=== (§e{0}§7) ===--- # ServerTeamNPC's -NPC_CHAT_1 = §fHallo, ich bin {0} und bin ein {1}§f. -NPC_CHAT_2 = §fWillkommen auf §eSteam§8War§f, viel Spaß dir. +NPC_CHAT_0 = §fHallo, ich bin {0} und bin ein {1}§f. +NPC_CHAT_1 = §fWillkommen auf §eSteam§8War§f, viel Spaß dir. +NPC_CHAT_2 = §eSteam§8War§f gibt es seit 2019. +NPC_CHAT_3 = &fBewerbe dich gerne für unser Team über unseren Discord-Server (https://steamwar.de/discord). +NPC_CHAT_4 = &fDu kannst mit unserm Lua Script-System deine eigenen Bau Features programmieren. +NPC_CHAT_5 = &fAuf dieser Lobby sind so einige secrets versteckt. # Portal Command PORTAL_COMMAND_LIST_HELP = §8/§7portal §elist §8- §7Listet alle Portale auf diff --git a/LobbySystem/src/de/steamwar/lobby/team/TeamPlayer.java b/LobbySystem/src/de/steamwar/lobby/team/TeamPlayer.java index 296b1d6f..5f2e55b9 100644 --- a/LobbySystem/src/de/steamwar/lobby/team/TeamPlayer.java +++ b/LobbySystem/src/de/steamwar/lobby/team/TeamPlayer.java @@ -60,11 +60,6 @@ public class TeamPlayer extends BasicListener { private Set players = new HashSet<>(); private Random random = new Random(); - private List strings = new ArrayList<>(); - { - strings.add("NPC_CHAT_1"); - strings.add("NPC_CHAT_2"); - } public static void spawnTeamPlayer(World world, SteamwarUser steamwarUser) { Location location = new Location(world, 2790.5, 69, 1311.5); @@ -149,8 +144,9 @@ public class TeamPlayer extends BasicListener { players.remove(event.getPlayer()); return; } + + String message = "NPC_Chat_" + random.nextInt(6); SteamwarUser user = SteamwarUser.get(event.getRightClicked().getName()); - String message = strings.get(random.nextInt(strings.size())); UserPerm.Prefix prefix = user.prefix(); LobbySystem.getMessage().send(message, event.getPlayer(), event.getRightClicked().getName(), prefix.getColorCode() + prefix.getChatPrefix()); }