Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixes versioning concurrently

Browse Source
This commit is contained in:
Sotr
2018-07-13 22:53:13 +08:00
parent 79d0207801
commit 269e1c30f1
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sources/src/main/java/io/akarin/server/mixin/core/MixinVersionCommand.java
View File

@@ -59,6 +59,9 @@ public abstract class MixinVersionCommand {
// This should be lying in 'obtainVersion' method, but bump for faster returning // This should be lying in 'obtainVersion' method, but bump for faster returning
if (customVersion) return; if (customVersion) return;
synchronized (versionWaiters) {
versionWaiters.add(sender);
}
if (versionObtaining) return; if (versionObtaining) return;
// The volatile guarantees the safety between different threads. // The volatile guarantees the safety between different threads.
// Remembers that we are still on main thread now, // Remembers that we are still on main thread now,
@@ -100,8 +103,6 @@ public abstract class MixinVersionCommand {
// We post all things because a custom version is rare (expiring is not rare), // We post all things because a custom version is rare (expiring is not rare),
// and we'd better post this task as early as we can, since it's a will (horrible destiny). // and we'd better post this task as early as we can, since it's a will (horrible destiny).
MCUtil.scheduleAsyncTask(() -> { MCUtil.scheduleAsyncTask(() -> {
// This should be lying in 'sendVersion' method, but comes here for relax main thread
versionWaiters.add(sender);
sender.sendMessage("Checking version, please wait..."); sender.sendMessage("Checking version, please wait...");
String version = Akari.getServerVersion(); String version = Akari.getServerVersion();
@@ -140,9 +141,11 @@ public abstract class MixinVersionCommand {
versionMessage = message; versionMessage = message;
hasVersion = true; hasVersion = true;
for (CommandSender sender : versionWaiters) { synchronized (versionWaiters) {
sender.sendMessage(versionMessage); for (CommandSender sender : versionWaiters) {
sender.sendMessage(versionMessage);
}
versionWaiters.clear();
} }
versionWaiters.clear();
} }
} }