From df2d9eccf0fa65ab55d9f4cf8e46de5e80f3f230 Mon Sep 17 00:00:00 2001 From: Zkitefly Date: Fri, 23 Aug 2024 01:02:36 +0000 Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E8=A7=A3=E6=9E=90=E5=8C=85?= =?UTF-8?q?=E5=90=AB=20hash=20=E7=9A=84=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/tungsten/fclcore/game/GameVersion.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/FCLCore/src/main/java/com/tungsten/fclcore/game/GameVersion.java b/FCLCore/src/main/java/com/tungsten/fclcore/game/GameVersion.java index faa3e4f2..94106125 100644 --- a/FCLCore/src/main/java/com/tungsten/fclcore/game/GameVersion.java +++ b/FCLCore/src/main/java/com/tungsten/fclcore/game/GameVersion.java @@ -17,7 +17,6 @@ */ package com.tungsten.fclcore.game; -import static com.tungsten.fclcore.util.Lang.tryCast; import static com.tungsten.fclcore.util.Logging.LOG; import com.google.gson.JsonParseException; @@ -47,8 +46,11 @@ public final class GameVersion { private static Optional getVersionFromJson(InputStream versionJson) { try { Map version = JsonUtils.fromNonNullJsonFully(versionJson, Map.class); - return tryCast(version.get("id"), String.class); - } catch (IOException | JsonParseException e) { + String id = (String) version.get("id"); + if (id != null && id.contains(" / ")) + id = id.substring(0, id.indexOf(" / ")); + return Optional.ofNullable(id); + } catch (IOException | JsonParseException | ClassCastException e) { LOG.log(Level.WARNING, "Failed to parse version.json", e); return Optional.empty(); }