mirrors/Havana
1
Fork 0
mirror of https://github.com/Quackster/Havana.git synced 2025-07-03 05:07:46 +00:00
Code Activity

Charset changes (#67)

Browse source 
* Update EncryptionDecoder.java [skip ci]

* Update EncryptionEncoder.java
This commit is contained in:
Quackster 2025-04-15 14:42:10 +10:00 • committed by GitHub
parent 1fbf1a3d1c
commit 687f3aa448
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Havana-Server/src/main/java/org/alexdev/havana/server/netty/codec/EncryptionDecoder.java
View file

@ -39,7 +39,7 @@ public class EncryptionDecoder extends ByteToMessageDecoder {
byte[] tHeaderMsg = new byte[6]; byte[] tHeaderMsg = new byte[6];
buffer.readBytes(tHeaderMsg); buffer.readBytes(tHeaderMsg);
tHeader = new String(tHeaderMsg); tHeader = new String(tHeaderMsg, StringUtil.getCharset());
tHeader = this.pHeaderDecoder.kg4R6Jo5xjlqtFGs1klMrK4ZTzb3R(tHeader); tHeader = this.pHeaderDecoder.kg4R6Jo5xjlqtFGs1klMrK4ZTzb3R(tHeader);
int tByte1 = ((int) tHeader.charAt(3)) & 63; int tByte1 = ((int) tHeader.charAt(3)) & 63;
@ -60,14 +60,14 @@ public class EncryptionDecoder extends ByteToMessageDecoder {
byte[] tBodyMsg = new byte[pMsgSize]; byte[] tBodyMsg = new byte[pMsgSize];
buffer.readBytes(tBodyMsg); buffer.readBytes(tBodyMsg);
tBody = new String(tBodyMsg); tBody = new String(tBodyMsg, StringUtil.getCharset());
tBody = this.pDecoder.kg4R6Jo5xjlqtFGs1klMrK4ZTzb3R(tBody); tBody = this.pDecoder.kg4R6Jo5xjlqtFGs1klMrK4ZTzb3R(tBody);
tBody = NettyPlayerNetwork.removePadding(tBody, player.getNetwork().getTx() % 5); tBody = NettyPlayerNetwork.removePadding(tBody, player.getNetwork().getTx() % 5);
ByteBuf result = Unpooled.buffer(); ByteBuf result = Unpooled.buffer();
result.writeBytes(Base64Encoding.encode(tBody.length(), 3)); result.writeBytes(Base64Encoding.encode(tBody.length(), 3));
result.writeBytes(tBody.getBytes()); result.writeBytes(tBody.getBytes(StringUtil.getCharset()));
out.add(result); out.add(result);
} }

6
Havana-Server/src/main/java/org/alexdev/havana/server/netty/codec/EncryptionEncoder.java
View file

@ -39,7 +39,7 @@ public class EncryptionEncoder extends MessageToMessageEncoder<ByteBuf> {
byte[] tOriginalMsgBytes = new byte[buffer.readableBytes()]; byte[] tOriginalMsgBytes = new byte[buffer.readableBytes()];
buffer.readBytes(tOriginalMsgBytes); buffer.readBytes(tOriginalMsgBytes);
String tOriginalMsg = new String(tOriginalMsgBytes); String tOriginalMsg = new String(tOriginalMsgBytes, StringUtil.getCharset());
String tHeader; String tHeader;
String tMsg; String tMsg;
@ -57,8 +57,8 @@ public class EncryptionEncoder extends MessageToMessageEncoder<ByteBuf> {
var tEncryptedMsg = Unpooled.buffer(); var tEncryptedMsg = Unpooled.buffer();
tEncryptedMsg.writeBytes(tHeader.getBytes()); tEncryptedMsg.writeBytes(tHeader.getBytes(StringUtil.getCharset()));
tEncryptedMsg.writeBytes(tMsg.getBytes()); tEncryptedMsg.writeBytes(tMsg.getBytes(StringUtil.getCharset()));
out.add(tEncryptedMsg); out.add(tEncryptedMsg);
} }