From ed4d1f5195c1d926c65ad48bf7579281522e66d9 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Sat, 27 Jun 2015 09:13:56 +1000 Subject: [PATCH] (Hopefully) fixed issue with older McDzienny versions incrementing message type by 1 for each login and causing chat to move to top right or disappear, even though this shouldn't do anything as the MessageTypes extension was not sent to the client. --- Network/FastNetReader.cs | 5 +++-- Network/NetworkProcessor.cs | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Network/FastNetReader.cs b/Network/FastNetReader.cs index 2c1f7fcb9..e2e353077 100644 --- a/Network/FastNetReader.cs +++ b/Network/FastNetReader.cs @@ -88,13 +88,14 @@ namespace ClassicalSharp { return new String( characters, 0, length ); } - static string GetWoMTextString( byte[] data, ref byte messageType ) { + static string GetWoMTextString( byte[] data, ref byte messageType ) { + messageType = (byte)CpeMessageType.Normal; int length = CopyTextStringToBuffer( data ); int offset = 0; if( IsWomDetailString( length ) ) { length -= womDetail.Length; offset += womDetail.Length; - messageType = 3; + messageType = (byte)CpeMessageType.Status3; } return new String( characters, offset, length ); } diff --git a/Network/NetworkProcessor.cs b/Network/NetworkProcessor.cs index 0ed6c72d8..cc7595e84 100644 --- a/Network/NetworkProcessor.cs +++ b/Network/NetworkProcessor.cs @@ -402,7 +402,9 @@ namespace ClassicalSharp { case PacketId.Message: { byte messageType = reader.ReadUInt8(); + Console.WriteLine( messageType ); string text = reader.ReadWoMTextString( ref messageType, useMessageTypes ); + Console.WriteLine( messageType + "," + text ); Window.AddChat( text, messageType ); } break;