From ebadbb453857bed7b253c58ae4771a65f1ab49a8 Mon Sep 17 00:00:00 2001
From: Jgunishka <53265225+Jgunishka@users.noreply.github.com>
Date: Wed, 21 Aug 2019 21:31:30 +0300
Subject: [PATCH] Changes for charset encode/decode

---
 src/org/emulinker/util/EmuUtil.java | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/org/emulinker/util/EmuUtil.java b/src/org/emulinker/util/EmuUtil.java
index a8b2706..2a3aff7 100644
--- a/src/org/emulinker/util/EmuUtil.java
+++ b/src/org/emulinker/util/EmuUtil.java
@@ -254,28 +254,29 @@ public class EmuUtil
 
 	public static String readString(ByteBuffer buffer, int stopByte, Charset charset)
 	{
-		//ByteBuffer tempBuffer = ByteBuffer.allocate(buffer.remaining());
-		char[] tempArray = new char[buffer.remaining()];
-		byte b;
-		int  i;
-//		while (buffer.hasRemaining())
-		for(i=0; i<tempArray.length; i++)
+		ByteBuffer tempBuffer = ByteBuffer.allocate(buffer.remaining());
+//		char[] tempArray = new char[buffer.remaining()];
+//		byte b;
+//		int  i;
+		while (buffer.hasRemaining())
+//		for(i=0; i<tempArray.length; i++)
 		{
+			byte b;
 			if ((b = buffer.get()) == stopByte)
 				break;
-//			tempBuffer.put(b);
-			tempArray[i] = (char)b;
+			tempBuffer.put(b);
+//			tempArray[i] = (char)b;
 		}
-//		return charset.decode((ByteBuffer) tempBuffer.flip()).toString();
-		return new String(tempArray, 0, i);
+		return charset.decode((ByteBuffer) tempBuffer.flip()).toString();
+//		return new String(tempArray, 0, i);
 	}
 
 	public static void writeString(ByteBuffer buffer, String s, int stopByte, Charset charset)
 	{
-//		buffer.put(charset.encode(s));
-		char[] tempArray = s.toCharArray();
-		for(int i=0; i<tempArray.length; i++)
-			buffer.put((byte) tempArray[i]);
+		buffer.put(charset.encode(s));
+//		char[] tempArray = s.toCharArray();
+//		for(int i=0; i<tempArray.length; i++)
+//			buffer.put((byte) tempArray[i]);
 		buffer.put((byte) stopByte);
 	}