nitro/G-Earth
1
0
Fork 0
mirror of https://github.com/sirjonasxx/G-Earth.git synced 2025-02-07 16:02:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

utf8 strings in expressions

Browse Source
This commit is contained in:
sirjonasxx 2020-06-28 15:46:29 +02:00
parent 88d72d9a67
commit 824a7d57aa
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
G-Earth/src/main/java/gearth/misc/packetrepresentation/PacketStringUtils.java
View File

@ -118,9 +118,10 @@ public class PacketStringUtils {
} }
} }
actualString.append(match); actualString.append(match);
String latin = new String(actualString.toString().getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1);
packet = packet.substring(0, start) + packet = packet.substring(0, start) +
toString(new HPacket(0, actualString.toString()).readBytes(actualString.length() + 2, 6)) + toString(new HPacket(0, latin).readBytes(latin.length() + 2, 6)) +
packet.substring(end + 2); packet.substring(end + 2);
} }
@ -195,7 +196,7 @@ public class PacketStringUtils {
} }
else if (c == 'i') builder.append("{i:").append(prevInt = p.readInteger()).append('}'); else if (c == 'i') builder.append("{i:").append(prevInt = p.readInteger()).append('}');
else if (c == 's') builder.append("{s:\"").append( else if (c == 's') builder.append("{s:\"").append(
p.readString() new String(p.readString().getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8)
.replace("\\", "\\\\") // \ -> \\ .replace("\\", "\\\\") // \ -> \\
.replace("\"", "\\\"") // " -> \" .replace("\"", "\\\"") // " -> \"
.replace("\r", "\\r") // CR -> \r .replace("\r", "\\r") // CR -> \r