zhdev/bukman
1
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Update on sync thread where possible

Browse source
This commit is contained in:
Frank van der Heijden 2020-07-20 02:06:28 +02:00
parent 71b6a5fa02
commit 6c8a93dc1b
No known key found for this signature in database
GPG key ID: 26DA56488D314D11
4 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/managers/BukkitTaskManager.java
View file

@ -6,6 +6,11 @@ import org.bukkit.Bukkit;
public class BukkitTaskManager extends AbstractTaskManager { public class BukkitTaskManager extends AbstractTaskManager {
@Override
public void runTask(Runnable runnable) {
Bukkit.getScheduler().runTask(ServerUtils.getInstance(), runnable);
}
@Override @Override
public void runTaskAsynchronously(Runnable runnable) { public void runTaskAsynchronously(Runnable runnable) {
Bukkit.getScheduler().runTaskAsynchronously(ServerUtils.getInstance(), runnable); Bukkit.getScheduler().runTaskAsynchronously(ServerUtils.getInstance(), runnable);

5
Bungee/src/main/java/net/frankheijden/serverutils/bungee/managers/BungeeTaskManager.java
View file

@ -6,6 +6,11 @@ import net.md_5.bungee.api.ProxyServer;
public class BungeeTaskManager extends AbstractTaskManager { public class BungeeTaskManager extends AbstractTaskManager {
@Override
public void runTask(Runnable runnable) {
runTaskAsynchronously(runnable);
}
@Override @Override
public void runTaskAsynchronously(Runnable runnable) { public void runTaskAsynchronously(Runnable runnable) {
ProxyServer.getInstance().getScheduler().runAsync(ServerUtils.getInstance(), runnable); ProxyServer.getInstance().getScheduler().runAsync(ServerUtils.getInstance(), runnable);

2
Common/src/main/java/net/frankheijden/serverutils/common/managers/AbstractTaskManager.java
View file

@ -2,5 +2,7 @@ package net.frankheijden.serverutils.common.managers;
public abstract class AbstractTaskManager { public abstract class AbstractTaskManager {
public abstract void runTask(Runnable runnable);
public abstract void runTaskAsynchronously(Runnable runnable); public abstract void runTaskAsynchronously(Runnable runnable);
} }

18
Common/src/main/java/net/frankheijden/serverutils/common/tasks/UpdateCheckerTask.java
View file

@ -176,15 +176,17 @@ public class UpdateCheckerTask implements Runnable {
} }
private void tryReloadPlugin() { private void tryReloadPlugin() {
String downloadedVersion = versionManager.getDownloadedVersion(); plugin.getTaskManager().runTask(() -> {
String downloadedVersion = versionManager.getDownloadedVersion();
if (isStartupCheck()) { if (isStartupCheck()) {
plugin.getLogger().info(String.format(DOWNLOADED_RESTART, downloadedVersion)); plugin.getLogger().info(String.format(DOWNLOADED_RESTART, downloadedVersion));
plugin.getPluginManager().reloadPlugin((Object)ServerUtilsApp.getPlatformPlugin()); plugin.getPluginManager().reloadPlugin((Object)ServerUtilsApp.getPlatformPlugin());
plugin.getLogger().info(String.format(UPGRADE_SUCCESS, downloadedVersion)); plugin.getLogger().info(String.format(UPGRADE_SUCCESS, downloadedVersion));
} else { } else {
broadcastDownloadStatus(downloadedVersion, false); broadcastDownloadStatus(downloadedVersion, false);
} }
});
} }
private void broadcastDownloadStatus(String githubVersion, boolean isError) { private void broadcastDownloadStatus(String githubVersion, boolean isError) {