MiniDay/hamster-ball
1
0
Fork 0
Code Issues Pull Requests Actions Releases 9 Activity

fix(common): 修复1.12.2及以下兼容性

Browse Source
This commit is contained in:
叁只仓鼠
2023-04-27 10:01:40 +08:00
parent d037cb7e91
commit b1dcd7afa3
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hamster-ball-common/build.gradle
View File

@@ -3,7 +3,7 @@ setArchivesBaseName("HamsterBall-Common")
dependencies { dependencies {
// https://mvnrepository.com/artifact/com.google.code.gson/gson // https://mvnrepository.com/artifact/com.google.code.gson/gson
//noinspection GradlePackageUpdate //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 // https://mvnrepository.com/artifact/io.netty/netty-all
compileOnly 'io.netty:netty-all:4.1.82.Final' compileOnly 'io.netty:netty-all:4.1.82.Final'

6
hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java
View File

@@ -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.constant.CoreConstantObjects;
import cn.hamster3.mc.plugin.core.common.data.DisplayMessage; import cn.hamster3.mc.plugin.core.common.data.DisplayMessage;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.JsonPrimitive; import com.google.gson.JsonPrimitive;
import io.netty.bootstrap.Bootstrap; import io.netty.bootstrap.Bootstrap;
import io.netty.channel.Channel; import io.netty.channel.Channel;
@@ -661,8 +659,8 @@ public abstract class BallAPI {
statement.setString(1, uuid.toString()); statement.setString(1, uuid.toString());
ResultSet set = statement.executeQuery(); ResultSet set = statement.executeQuery();
while (set.next()) { while (set.next()) {
JsonObject object = JsonParser.parseString(set.getString("msg")).getAsJsonObject(); DisplayMessage msg = CoreConstantObjects.GSON.fromJson(set.getString("msg"), DisplayMessage.class);
list.add(new DisplayMessage().fromJson(object)); list.add(msg);
} }
statement.close(); statement.close();
} }