Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-02-05 06:51:45 +01:00
Code Issues Projects Releases Wiki Activity

Fixed #300

Browse Source
This commit is contained in:
Rsl1122 2017-09-28 19:14:28 +03:00
parent 2835b1eaf4
commit 3892fb6e3c
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Plan/src/main/java/com/djrapitops/plan/PlanBungee.java
View File

@ -6,6 +6,7 @@ package main.java.com.djrapitops.plan;
import com.djrapitops.plugin.BungeePlugin; import com.djrapitops.plugin.BungeePlugin;
import com.djrapitops.plugin.settings.ColorScheme; import com.djrapitops.plugin.settings.ColorScheme;
import com.djrapitops.plugin.task.AbsRunnable;
import main.java.com.djrapitops.plan.api.IPlan; import main.java.com.djrapitops.plan.api.IPlan;
import main.java.com.djrapitops.plan.api.exceptions.DatabaseInitException; import main.java.com.djrapitops.plan.api.exceptions.DatabaseInitException;
import main.java.com.djrapitops.plan.command.commands.ReloadCommand; import main.java.com.djrapitops.plan.command.commands.ReloadCommand;
@ -38,7 +39,7 @@ public class PlanBungee extends BungeePlugin<PlanBungee> implements IPlan {
private WebServer webServer; private WebServer webServer;
private Database db; private Database db;
private BungeeServerInfoManager serverInfoManager; private BungeeServerInfoManager serverInfoManager;
private InformationManager infoManager; private BungeeInformationManager infoManager;
private ServerVariableHolder variableHolder; private ServerVariableHolder variableHolder;
private ProcessingQueue processingQueue; private ProcessingQueue processingQueue;
@ -81,14 +82,20 @@ public class PlanBungee extends BungeePlugin<PlanBungee> implements IPlan {
webServer.initServer(); webServer.initServer();
infoManager.attemptConnection();
if (!webServer.isEnabled()) { if (!webServer.isEnabled()) {
Log.error("WebServer was not successfully initialized."); Log.error("WebServer was not successfully initialized.");
disablePlugin(); disablePlugin();
return; return;
} }
getRunnableFactory().createNew("Enable Bukkit Connection Task", new AbsRunnable() {
@Override
public void run() {
infoManager.attemptConnection();
infoManager.sendConfigSettings();
}
}).runTaskAsynchronously();
getProxy().registerChannel("Plan"); getProxy().registerChannel("Plan");
registerListener(new BungeePluginChannelListener(this)); registerListener(new BungeePluginChannelListener(this));

9
Plan/src/main/java/com/djrapitops/plan/systems/info/BungeeInformationManager.java
View File

@ -353,8 +353,13 @@ public class BungeeInformationManager extends InformationManager {
@Override @Override
public void updateNetworkPageContent() { public void updateNetworkPageContent() {
Collection<ServerInfo> online = serverInfoManager.getOnlineBukkitServers(); Collection<ServerInfo> online = serverInfoManager.getOnlineBukkitServers();
bukkitServers.values().stream() online.stream().map(ServerInfo::getUuid)
.filter(s -> !online.contains(s)).map(ServerInfo::getUuid)
.forEach(this::removeNetworkPageContent); .forEach(this::removeNetworkPageContent);
} }
public void sendConfigSettings() {
Collection<ServerInfo> online = serverInfoManager.getOnlineBukkitServers();
online.stream().map(ServerInfo::getUuid)
.forEach(serverInfoManager::sendConfigSettings);
}
} }

2
Plan/src/main/java/com/djrapitops/plan/systems/info/server/BungeeServerInfoManager.java
View File

@ -97,7 +97,7 @@ public class BungeeServerInfoManager {
} }
} }
private void sendConfigSettings(UUID serverUUID) { public void sendConfigSettings(UUID serverUUID) {
try { try {
ServerInfo server = bukkitServers.get(serverUUID); ServerInfo server = bukkitServers.get(serverUUID);
if (server == null) { if (server == null) {