From b1dcd7afa3289f0a037c2603262187f35af415af Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Thu, 27 Apr 2023 10:01:40 +0800 Subject: [PATCH] =?UTF-8?q?fix(common):=20=E4=BF=AE=E5=A4=8D1.12.2?= =?UTF-8?q?=E5=8F=8A=E4=BB=A5=E4=B8=8B=E5=85=BC=E5=AE=B9=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hamster-ball-common/build.gradle | 2 +- .../java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/hamster-ball-common/build.gradle b/hamster-ball-common/build.gradle index 78be76f..b443905 100644 --- a/hamster-ball-common/build.gradle +++ b/hamster-ball-common/build.gradle @@ -3,7 +3,7 @@ setArchivesBaseName("HamsterBall-Common") dependencies { // https://mvnrepository.com/artifact/com.google.code.gson/gson //noinspection GradlePackageUpdate - compileOnly 'com.google.code.gson:gson:2.8.9' + compileOnly 'com.google.code.gson:gson:2.8.0' // https://mvnrepository.com/artifact/io.netty/netty-all compileOnly 'io.netty:netty-all:4.1.82.Final' diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java index a5a3520..0a9dfa1 100644 --- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java +++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java @@ -18,8 +18,6 @@ import cn.hamster3.mc.plugin.core.common.api.CoreAPI; import cn.hamster3.mc.plugin.core.common.constant.CoreConstantObjects; import cn.hamster3.mc.plugin.core.common.data.DisplayMessage; import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; import com.google.gson.JsonPrimitive; import io.netty.bootstrap.Bootstrap; import io.netty.channel.Channel; @@ -661,8 +659,8 @@ public abstract class BallAPI { statement.setString(1, uuid.toString()); ResultSet set = statement.executeQuery(); while (set.next()) { - JsonObject object = JsonParser.parseString(set.getString("msg")).getAsJsonObject(); - list.add(new DisplayMessage().fromJson(object)); + DisplayMessage msg = CoreConstantObjects.GSON.fromJson(set.getString("msg"), DisplayMessage.class); + list.add(msg); } statement.close(); }