Fix an IllegalStateException related to restricted servers

ME1312 · Dec 2, 2018 · 82dcc68 · 82dcc68
1 parent 4e58e01
commit 82dcc68
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java
@@ -724,7 +724,8 @@ public void reroute(ServerConnectEvent e) {
 
         if (!e.getTarget().canAccess(e.getPlayer())) {
             e.setCancelled(true);
-            e.getPlayer().sendMessage(getTranslation("no_server_permission"));
+            if (e.getPlayer().getServer() != null) e.getPlayer().sendMessage(getTranslation("no_server_permission"));
+            else e.getPlayer().disconnect(getTranslation("no_server_permission"));
         }
     }
 

diff --git a/SubServers.Host/pom.xml b/SubServers.Host/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiEngine</artifactId>
-            <version>18w47f</version>
+            <version>18w49a</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java b/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java
@@ -244,7 +244,7 @@ private ExHost(joptsimple.OptionSet options) {
             }
         } catch (Exception e) {
             log.error.println(e);
-            engine.stop();
+            engine.stop(1);
         }
     }
 

diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java
@@ -253,7 +253,8 @@ public void reroute(ServerConnectEvent e) {
 
         if (!e.getTarget().canAccess(e.getPlayer())) {
             e.setCancelled(true);
-            e.getPlayer().sendMessage(getTranslation("no_server_permission"));
+            if (e.getPlayer().getServer() != null) e.getPlayer().sendMessage(getTranslation("no_server_permission"));
+            else e.getPlayer().disconnect(getTranslation("no_server_permission"));
         }
     }