Feedback when executing the command and not having a parent to connect to

Author: jamezrin

lobbybalancer.iml

@@ -116,7 +116,7 @@
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.2" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.2" level="project" />
-    <orderEntry type="library" name="Maven: org.bstats:bstats-bungeecord:1.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.bstats:bstats-bungeecord:1.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
   </component>

pom.xml

@@ -52,7 +52,6 @@
                 <artifactId>maven-shade-plugin</artifactId>
                 <version>2.4.3</version>
                 <configuration>
-                    <minimizeJar>true</minimizeJar>
                     <relocations>
                         <relocation>
                             <pattern>org.bstats</pattern>

src/main/java/me/jaimemartz/lobbybalancer/commands/FallbackCommand.java

@@ -44,24 +44,29 @@ public void execute(CommandSender sender, String[] args) {
                         }
 
                         return target;
-                    } else {
-                        Configuration rules = plugin.getConfig().getSection("settings.fallback-command.rules");
-                        String bind = rules.getString(section.getName());
-                        ServerSection target = plugin.getSectionManager().getByName(bind);
+                    }
 
-                        if (target == null) {
+                    Configuration rules = plugin.getConfig().getSection("settings.fallback-command.rules");
+                    String bind = rules.getString(section.getName());
+                    ServerSection target = plugin.getSectionManager().getByName(bind);
+
+                    if (target == null) {
+                        if (section.hasParent()) {
                             target = section.getParent();
+                        } else {
+                            msgr.send(ConfigEntries.UNAVAILABLE_MESSAGE.get());
+                            return null;
                         }
+                    }
 
-                        if (ConfigEntries.FALLBACK_COMMAND_RESTRICTED.get()) {
-                            if (section.getPosition() >= 0 && target.getPosition() < 0) {
-                                msgr.send(ConfigEntries.UNAVAILABLE_MESSAGE.get());
-                                return null;
-                            }
+                    if (ConfigEntries.FALLBACK_COMMAND_RESTRICTED.get()) {
+                        if (section.getPosition() >= 0 && target.getPosition() < 0) {
+                            msgr.send(ConfigEntries.UNAVAILABLE_MESSAGE.get());
+                            return null;
                         }
-
-                        return target;
                     }
+
+                    return target;
                 } else {
                     if (ConfigEntries.FALLBACK_PRINCIPAL_ENABLED.get()) {
                         return plugin.getSectionManager().getPrincipal();

src/main/java/me/jaimemartz/lobbybalancer/configuration/ConfigEntries.java

@@ -30,7 +30,6 @@ public class ConfigEntries implements ConfigEntryHolder {
     public static final ConfigEntry<Boolean> RECONNECT_KICK_RESTRICTED = new ConfigEntry<>(0, "settings.reconnect-kick.restricted", true);
     public static final ConfigEntry<Boolean> RECONNECT_KICK_EXCLUDE_FROM = new ConfigEntry<>(0, "settings.reconnect-kick.exclude-from", true);
     public static final ConfigEntry<Boolean> RECONNECT_KICK_FORCE_PRINCIPAL = new ConfigEntry<>(0, "settings.reconnect-kick.force-principal", false);
-    public static final ConfigEntry<String> RECONNECT_KICK_MESSAGE = new ConfigEntry<>(0, "settings.reconnect-kick.message", "&cYou have been kicked from &a{from} &cand you are being moved to &a{to}&c, reason: &a{reason}");
 
     public static final ConfigEntry<Boolean> FALLBACK_COMMAND_ENABLED = new ConfigEntry<>(0, "settings.fallback-command.enabled", true);
     public static final ConfigEntry<String> FALLBACK_COMMAND_NAME = new ConfigEntry<>(0, "settings.fallback-command.name", "fallback");
@@ -50,6 +49,7 @@ public class ConfigEntries implements ConfigEntryHolder {
     public static final ConfigEntry<String> FAILURE_MESSAGE = new ConfigEntry<>(0, "settings.messages.failure", null);
     public static final ConfigEntry<String> UNAVAILABLE_MESSAGE = new ConfigEntry<>(0, "settings.messages.unavailable", null);
     public static final ConfigEntry<String> UNKNOWN_SECTION_MESSAGE = new ConfigEntry<>(0, "settings.messages.unknown", null);
+    public static final ConfigEntry<String> KICK_MESSAGE = new ConfigEntry<>(0, "settings.messages.kick", null);
 
     public static final ConfigEntry<String> CONFIG_VERSION = new ConfigEntry<>(0, "version", null);
 }

src/main/java/me/jaimemartz/lobbybalancer/listener/ServerKickListener.java

@@ -117,7 +117,7 @@ public void onKick(ServerKickEvent event) {
                     @Override
                     public void connect(ServerInfo server) {
                         PlayerLocker.lock(player);
-                        msgr.send(ConfigEntries.RECONNECT_KICK_MESSAGE.get(),
+                        msgr.send(ConfigEntries.KICK_MESSAGE.get(),
                                 new Replacement("{from}", from.getName()),
                                 new Replacement("{to}", server.getName()),
                                 new Replacement("{reason}", TextComponent.toPlainText(event.getKickReasonComponent())));

src/main/resources/config.yml

@@ -60,9 +60,6 @@ settings:
     # This prints info every time a player gets kicked telling you the reason and if it matches the reasons
     print-info: false
 
-    # The message the player is sent when kicked, comment it out to remove the message
-    message: '&cYou have been kicked from &a{from} &cand you are being moved to &a{to}&c, reason: &a{reason}'
-
     # You can override the behavior with rules, overriding the parent section
     # This will set the section to go when you come from the section specified
     # This will still require the kick reasons to match
@@ -137,6 +134,7 @@ settings:
     failure: '&cCould not find a server to get connected'
     unavailable: '&cThis command cannot be executed on this server'
     unknown: '&cCould not find a section with that name'
+    kick: '&cYou have been kicked from &a{from} &cand you are being moved to &a{to}&c, reason: &a{reason}'
 
 # Here you have an example of what you can do with the sections
 # The plugin will print out info telling you if your config is right or not

src/main/resources/plugin.yml

@@ -2,4 +2,4 @@ name: LobbyBalancer
 main: me.jaimemartz.lobbybalancer.LobbyBalancer
 version: ${project.version}
 author: jaime29010
-softdepend: [RedisBungee]
+softdepend: [RedisBungee, LibraryLoader]