ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-01-03 14:23:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' into sestring_payloads_refactor

Browse source 
# Conflicts:
#	Dalamud/Game/Chat/SeStringHandling/Payloads/TextPayload.cs
This commit is contained in:
meli 2020-04-26 14:54:59 -07:00
commit 75f563993d
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

@ -93,7 +93,10 @@ namespace Dalamud.Game.Chat.SeStringHandling
var payloadStartPos = reader.BaseStream.Position;
Payload payload = null;
if ((byte)reader.PeekChar() != START_BYTE)
var initialByte = reader.ReadByte();
reader.BaseStream.Position--;
if (initialByte != START_BYTE)
{
payload = DecodeText(reader);
}

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

@ -62,11 +62,15 @@ namespace Dalamud.Game.Chat.SeStringHandling.Payloads
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;
}
// not the most efficient, but the easiest
textBytes.Add(reader.ReadByte());
textBytes.Add(nextByte);
}
if (textBytes.Count > 0)