ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-17 06:04:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #99 from ff-meli/master

Browse source
This commit is contained in:
goaaats 2020-04-26 23:48:44 +02:00 • committed by GitHub
commit 299ca5daca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Dalamud/Game/Chat/SeStringHandling/Payload.cs
View file

@ -30,7 +30,10 @@ namespace Dalamud.Game.Chat.SeStringHandling
public static Payload Process(BinaryReader reader) public static Payload Process(BinaryReader reader)
{ {
Payload payload = null; Payload payload = null;
if ((byte)reader.PeekChar() != START_BYTE)
var initialByte = reader.ReadByte();
reader.BaseStream.Position--;
if (initialByte != START_BYTE)
{ {
payload = ProcessText(reader); payload = ProcessText(reader);
} }

10
Dalamud/Game/Chat/SeStringHandling/Payloads/TextPayload.cs
View file

@ -58,11 +58,15 @@ namespace Dalamud.Game.Chat.SeStringHandling.Payloads
while (reader.BaseStream.Position < endOfStream) while (reader.BaseStream.Position < endOfStream)
{ {
if ((byte)reader.PeekChar() == START_BYTE) var nextByte = reader.ReadByte();
if (nextByte == START_BYTE)
{
// rewind since this byte isn't part of this payload
reader.BaseStream.Position--;
break; break;
}
// not the most efficient, but the easiest text.Add(nextByte);
text.Add(reader.ReadByte());
} }
if (text.Count > 0) if (text.Count > 0)