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

Fixes version lookup

Browse Source
This commit is contained in:
Sotr
2018-05-25 23:14:11 +08:00
parent 25e0d1fc43
commit 270a5d84f1
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,13 +68,16 @@ public class MixinVersionCommand {
long current = System.currentTimeMillis(); long current = System.currentTimeMillis();
if (current - lastCheckMillis > 7200000 /* 2 hours */) { if (current - lastCheckMillis > 7200000 /* 2 hours */) {
lastCheckMillis = current; lastCheckMillis = current;
obtainVersion(sender); hasVersion = false;
/* TODO Option: legacy-versioning-compat */ currentSender = sender;
} else { } else {
sender.sendMessage(versionMessage); sender.sendMessage(versionMessage);
return; return;
} }
} }
if (!hasVersion) {
obtainVersion(sender);
/* TODO Option: legacy-versioning-compat */ currentSender = sender;
}
} }
private CommandSender currentSender; private CommandSender currentSender;
@@ -98,6 +101,7 @@ public class MixinVersionCommand {
MCUtil.scheduleAsyncTask(() -> { MCUtil.scheduleAsyncTask(() -> {
// This should be lying in 'sendVersion' method, but comes here for relax main thread // This should be lying in 'sendVersion' method, but comes here for relax main thread
versionWaiters.add(sender); versionWaiters.add(sender);
sender.sendMessage("Checking version, please wait...");
String version = Bukkit.getVersion(); String version = Bukkit.getVersion();
if (version == null) { if (version == null) {
@@ -107,7 +111,6 @@ public class MixinVersionCommand {
} }
if (version.startsWith("git-Akarin-")) { if (version.startsWith("git-Akarin-")) {
String[] parts = version.substring("git-Akarin-".length()).split("[-\\s]"); String[] parts = version.substring("git-Akarin-".length()).split("[-\\s]");
int distance = getDistance(null, parts[0]); int distance = getDistance(null, parts[0]);
switch (distance) { switch (distance) {
@@ -126,7 +129,6 @@ public class MixinVersionCommand {
} else { } else {
customVersion = true; customVersion = true;
} }
versionObtaining = false; versionObtaining = false;
}); });
} }