diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java index 125b2235..ffb344bc 100644 --- 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 final class SubPlugin extends BungeeCord implements Listener { 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 index 5b78e518..ace7467f 100644 --- a/SubServers.Host/pom.xml +++ b/SubServers.Host/pom.xml @@ -20,7 +20,7 @@ net.ME1312.Galaxi GalaxiEngine - 18w47f + 18w49a compile diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java b/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java index e6687ce2..8c809385 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java @@ -244,7 +244,7 @@ public final class ExHost { } } 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 index 508ece1e..4cdd6d8b 100644 --- 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 final class SubPlugin extends BungeeCord implements Listener { 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")); } }