Skip to content

Commit 59ceba2

Browse files
Merge pull request #16 from OrnitheMC/fix-osl-cache-for-beta
fix osl cache for pre-1.3
2 parents 375d22e + 8c31b17 commit 59ceba2

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

src/main/java/net/ornithemc/ploceus/OslVersionCache.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ private String getModuleVersion(String module, String version, GameSide side) {
255255
}
256256

257257
private String getModuleVersionFromMeta(String module, String version, GameSide side) throws Exception {
258-
String metaUrl = Constants.META_URL + Constants.oslModuleVersionMetaEndpoint(intermediaryGeneration(), module, minecraftVersion(), version + side.suffix());
258+
String metaUrl = Constants.META_URL + Constants.oslModuleVersionMetaEndpoint(intermediaryGeneration(), module, minecraftVersion(), version);
259259

260260
try (InputStreamReader ir = new InputStreamReader(new URI(metaUrl).toURL().openStream())) {
261261
JsonArray modulesJson = GSON.fromJson(ir, JsonArray.class);
@@ -315,7 +315,13 @@ private String getModuleVersionFromCache(String module, String version, GameSide
315315
return null;
316316
}
317317

318-
return moduleVersionJson.get(side.id()).getAsString();
318+
JsonElement moduleVersion = moduleVersionJson.get(side.id());
319+
320+
if (moduleVersion == null) {
321+
return null;
322+
}
323+
324+
return moduleVersion.getAsString();
319325
}
320326

321327
private void saveModuleVersionToCache(String module, String version, GameSide side, String moduleVersion) throws Exception {

0 commit comments

Comments
 (0)