From 687f3aa4486d8b49e5473d5aca7bb510515941ac Mon Sep 17 00:00:00 2001 From: Quackster Date: Tue, 15 Apr 2025 14:42:10 +1000 Subject: [PATCH] Charset changes (#67) * Update EncryptionDecoder.java [skip ci] * Update EncryptionEncoder.java --- .../havana/server/netty/codec/EncryptionDecoder.java | 8 ++++---- .../havana/server/netty/codec/EncryptionEncoder.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Havana-Server/src/main/java/org/alexdev/havana/server/netty/codec/EncryptionDecoder.java b/Havana-Server/src/main/java/org/alexdev/havana/server/netty/codec/EncryptionDecoder.java index 471271c..0289ef7 100644 --- a/Havana-Server/src/main/java/org/alexdev/havana/server/netty/codec/EncryptionDecoder.java +++ b/Havana-Server/src/main/java/org/alexdev/havana/server/netty/codec/EncryptionDecoder.java @@ -39,7 +39,7 @@ public class EncryptionDecoder extends ByteToMessageDecoder { byte[] tHeaderMsg = new byte[6]; buffer.readBytes(tHeaderMsg); - tHeader = new String(tHeaderMsg); + tHeader = new String(tHeaderMsg, StringUtil.getCharset()); tHeader = this.pHeaderDecoder.kg4R6Jo5xjlqtFGs1klMrK4ZTzb3R(tHeader); int tByte1 = ((int) tHeader.charAt(3)) & 63; @@ -60,16 +60,16 @@ public class EncryptionDecoder extends ByteToMessageDecoder { byte[] tBodyMsg = new byte[pMsgSize]; buffer.readBytes(tBodyMsg); - tBody = new String(tBodyMsg); + tBody = new String(tBodyMsg, StringUtil.getCharset()); tBody = this.pDecoder.kg4R6Jo5xjlqtFGs1klMrK4ZTzb3R(tBody); tBody = NettyPlayerNetwork.removePadding(tBody, player.getNetwork().getTx() % 5); ByteBuf result = Unpooled.buffer(); result.writeBytes(Base64Encoding.encode(tBody.length(), 3)); - result.writeBytes(tBody.getBytes()); + result.writeBytes(tBody.getBytes(StringUtil.getCharset())); out.add(result); } } -} \ No newline at end of file +} diff --git a/Havana-Server/src/main/java/org/alexdev/havana/server/netty/codec/EncryptionEncoder.java b/Havana-Server/src/main/java/org/alexdev/havana/server/netty/codec/EncryptionEncoder.java index b392f18..152a525 100644 --- a/Havana-Server/src/main/java/org/alexdev/havana/server/netty/codec/EncryptionEncoder.java +++ b/Havana-Server/src/main/java/org/alexdev/havana/server/netty/codec/EncryptionEncoder.java @@ -39,7 +39,7 @@ public class EncryptionEncoder extends MessageToMessageEncoder { byte[] tOriginalMsgBytes = new byte[buffer.readableBytes()]; buffer.readBytes(tOriginalMsgBytes); - String tOriginalMsg = new String(tOriginalMsgBytes); + String tOriginalMsg = new String(tOriginalMsgBytes, StringUtil.getCharset()); String tHeader; String tMsg; @@ -57,9 +57,9 @@ public class EncryptionEncoder extends MessageToMessageEncoder { var tEncryptedMsg = Unpooled.buffer(); - tEncryptedMsg.writeBytes(tHeader.getBytes()); - tEncryptedMsg.writeBytes(tMsg.getBytes()); + tEncryptedMsg.writeBytes(tHeader.getBytes(StringUtil.getCharset())); + tEncryptedMsg.writeBytes(tMsg.getBytes(StringUtil.getCharset())); out.add(tEncryptedMsg); } -} \ No newline at end of file +}