GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

More changes to allow Geyser to cooperate better with bad internet (#1951)

Browse source
This commit is contained in:
Camotoy 2021-02-21 18:57:09 -05:00 committed by GitHub
parent b7828267a5
commit f480fbfdf6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
connector/src/main/java/org/geysermc/connector/utils/LocaleUtils.java
View file

@ -147,6 +147,12 @@ public class LocaleUtils {
} }
} }
} catch (IOException ignored) { } } catch (IOException ignored) { }
if (clientJarInfo == null) {
// Likely failed to download
GeyserConnector.getInstance().getLogger().debug("Skipping en_US hash check as client jar is null.");
return;
}
targetHash = clientJarInfo.getSha1(); targetHash = clientJarInfo.getSha1();
} else { } else {
curHash = byteArrayToHexString(FileUtils.calculateSHA1(localeFile)); curHash = byteArrayToHexString(FileUtils.calculateSHA1(localeFile));
@ -168,9 +174,13 @@ public class LocaleUtils {
return; return;
} }
try {
// Get the hash and download the locale // Get the hash and download the locale
String hash = ASSET_MAP.get("minecraft/lang/" + locale + ".json").getHash(); String hash = ASSET_MAP.get("minecraft/lang/" + locale + ".json").getHash();
WebUtils.downloadFile("https://resources.download.minecraft.net/" + hash.substring(0, 2) + "/" + hash, localeFile.toString()); WebUtils.downloadFile("https://resources.download.minecraft.net/" + hash.substring(0, 2) + "/" + hash, localeFile.toString());
} catch (Exception e) {
GeyserConnector.getInstance().getLogger().error("Unable to download locale file hash", e);
}
} }
/** /**

3
connector/src/main/java/org/geysermc/connector/utils/WebUtils.java
View file

@ -88,8 +88,7 @@ public class WebUtils {
} }
public static String post(String reqURL, String postContent) throws IOException { public static String post(String reqURL, String postContent) throws IOException {
URL url = null; URL url = new URL(reqURL);
url = new URL(reqURL);
HttpURLConnection con = (HttpURLConnection) url.openConnection(); HttpURLConnection con = (HttpURLConnection) url.openConnection();
con.setRequestMethod("POST"); con.setRequestMethod("POST");
con.setRequestProperty("Content-Type", "text/plain"); con.setRequestProperty("Content-Type", "text/plain");