1
0
Fork 0

Temporary remove KCauldron auto update

kcx-1614
xjboss 2017-07-22 19:55:46 +08:00
parent 8e548b3896
commit 96fc873f32
3 changed files with 9 additions and 4 deletions

View File

@ -38,8 +38,8 @@ public class KCauldronCommand extends Command {
super(NAME); super(NAME);
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.append(String.format("/%s check - Check to update\n", NAME)); //builder.append(String.format("/%s check - Check to update\n", NAME));
builder.append(String.format("/%s update [version] - Update to specified or latest version\n", NAME)); //builder.append(String.format("/%s update [version] - Update to specified or latest version\n", NAME));
builder.append(String.format("/%s tps - Show tps statistics\n", NAME)); builder.append(String.format("/%s tps - Show tps statistics\n", NAME));
builder.append(String.format("/%s restart - Restart server\n", NAME)); builder.append(String.format("/%s restart - Restart server\n", NAME));
builder.append(String.format("/%s dump - Dump statistics into kcauldron.dump file\n", NAME)); builder.append(String.format("/%s dump - Dump statistics into kcauldron.dump file\n", NAME));
@ -80,10 +80,14 @@ public class KCauldronCommand extends Command {
if ("check".equals(action)) { if ("check".equals(action)) {
if (!testPermission(sender, CHECK)) if (!testPermission(sender, CHECK))
return true; return true;
/*
sender.sendMessage(ChatColor.GREEN + "Initiated version check..."); sender.sendMessage(ChatColor.GREEN + "Initiated version check...");
KVersionRetriever.startServer(new CommandSenderUpdateCallback(sender), false); KVersionRetriever.startServer(new CommandSenderUpdateCallback(sender), false);
*/
} else if ("update".equals(action)) { } else if ("update".equals(action)) {
/*
KCauldronUpdater.initUpdate(sender, args.length > 1 ? args[1] : null); KCauldronUpdater.initUpdate(sender, args.length > 1 ? args[1] : null);
*/
} else if ("tps".equals(action)) { } else if ("tps".equals(action)) {
if (!testPermission(sender, TPS)) if (!testPermission(sender, TPS))
return true; return true;

View File

@ -21,6 +21,7 @@ public class DefaultUpdateCallback implements IVersionCheckCallback {
public void onPlayerJoin(PlayerJoinEvent event) { public void onPlayerJoin(PlayerJoinEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
if (hasPermission(player)) { if (hasPermission(player)) {
/*
if (KCauldron.isLegacy()) { if (KCauldron.isLegacy()) {
player.sendMessage(ChatColor.YELLOW + "We're running on legacy version on KCauldron, please update your version"); player.sendMessage(ChatColor.YELLOW + "We're running on legacy version on KCauldron, please update your version");
} }
@ -30,6 +31,7 @@ public class DefaultUpdateCallback implements IVersionCheckCallback {
if (mHasUpdate) { if (mHasUpdate) {
sendUpdate(player); sendUpdate(player);
} }
*/
} }
} }

View File

@ -14,7 +14,6 @@ import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.client.LaxRedirectStrategy; import org.apache.http.impl.client.LaxRedirectStrategy;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser; import org.json.simple.parser.JSONParser;
public class KVersionRetriever implements Runnable, UncaughtExceptionHandler { public class KVersionRetriever implements Runnable, UncaughtExceptionHandler {
private static final boolean DEBUG; private static final boolean DEBUG;
private static final KLog sLogger; private static final KLog sLogger;
@ -76,7 +75,7 @@ public class KVersionRetriever implements Runnable, UncaughtExceptionHandler {
} }
} }
} }
@Deprecated
private void check() { private void check() {
try { try {
HttpUriRequest request = RequestBuilder HttpUriRequest request = RequestBuilder