From 10945927c19a19d39d90d5704140fda78db70d93 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 2 Mar 2023 18:11:41 +0100 Subject: [PATCH 1/2] Fix writeString not fully respecting charset The string would be cut short for charsets with characters more than 1 byte. --- src/main/java/net/packet/ByteBufOutPacket.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/packet/ByteBufOutPacket.java b/src/main/java/net/packet/ByteBufOutPacket.java index dbb8e75fbe..ce289603be 100644 --- a/src/main/java/net/packet/ByteBufOutPacket.java +++ b/src/main/java/net/packet/ByteBufOutPacket.java @@ -71,8 +71,9 @@ public class ByteBufOutPacket implements OutPacket { @Override public void writeString(String value) { - writeShort((short) value.length()); - writeBytes(value.getBytes(CharsetConstants.CHARSET)); + byte[] bytes = value.getBytes(CharsetConstants.CHARSET); + writeShort(bytes.length); + writeBytes(bytes); } @Override From f4062e5ebbd7a57fe1df14b779d54a23075b46aa Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 2 Mar 2023 18:31:21 +0100 Subject: [PATCH 2/2] Upgrade dependencies --- pom.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index c5ac497114..93823a00c5 100644 --- a/pom.xml +++ b/pom.xml @@ -19,22 +19,22 @@ net.server.Server - 3.0.0-M7 - 3.2.2 - 3.4.2 + 3.0.0-M9 + 3.3.0 + 3.5.0 1.7.36 - 2.18.0 - 22.2.0 - 4.1.79.Final + 2.20.0 + 22.3.1 + 4.1.89.Final 1.15 1.0 5.0.1 - 8.0.30 - 3.35.0 - 5.9.0 - 4.7.0 + 8.0.32 + 3.37.1 + 5.9.2 + 5.1.1 @@ -56,9 +56,9 @@ ${HikariCP.version} - mysql - mysql-connector-java - ${mysql-connector-java.version} + com.mysql + mysql-connector-j + ${mysql-connector-j.version} org.jdbi @@ -204,4 +204,4 @@ - \ No newline at end of file +