diff --git a/CommonCore b/CommonCore index a249d66d..0c68dfd1 160000 --- a/CommonCore +++ b/CommonCore @@ -1 +1 @@ -Subproject commit a249d66dcf96bb9aef44b700438c81670ad81de7 +Subproject commit 0c68dfd19dc32a848be2cf399e00bc2863739b57 diff --git a/src/de/steamwar/bungeecore/BungeeCore.java b/src/de/steamwar/bungeecore/BungeeCore.java index df18fb21..4013f34f 100644 --- a/src/de/steamwar/bungeecore/BungeeCore.java +++ b/src/de/steamwar/bungeecore/BungeeCore.java @@ -115,7 +115,9 @@ public class BungeeCore extends Plugin { new PingListener(); local = new Node.LocalNode(); - //new Node.RemoteNode("lx"); + if(MAIN_SERVER) { + new Node.RemoteNode("lx"); + } commands.put("/tp", null); commands.put("/bc", null); diff --git a/src/de/steamwar/bungeecore/Node.java b/src/de/steamwar/bungeecore/Node.java index 6c221200..55885303 100644 --- a/src/de/steamwar/bungeecore/Node.java +++ b/src/de/steamwar/bungeecore/Node.java @@ -208,7 +208,7 @@ public abstract class Node { protected void calcLoadLimit() { try { Process process = prepareExecution("cat /proc/stat /proc/meminfo").start(); - if(process.waitFor(1, TimeUnit.SECONDS)) + if(!process.waitFor(1, TimeUnit.SECONDS)) throw new IOException(hostname + " timeout"); try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) { calcLoadLimit(reader, reader);