From 1b72c67cace7a723080195e89e91a6dd0dfadad2 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Thu, 5 Nov 2015 15:10:38 +1100 Subject: [PATCH] Fix duplicate messages being set, fix humanoid left arm being flipped horizontally. --- ClassicalSharp/2D/Widgets/Chat/TextInputWidget.cs | 3 +++ ClassicalSharp/Model/PlayerModel.cs | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ClassicalSharp/2D/Widgets/Chat/TextInputWidget.cs b/ClassicalSharp/2D/Widgets/Chat/TextInputWidget.cs index 571ff656f..043c3dba3 100644 --- a/ClassicalSharp/2D/Widgets/Chat/TextInputWidget.cs +++ b/ClassicalSharp/2D/Widgets/Chat/TextInputWidget.cs @@ -141,6 +141,8 @@ namespace ClassicalSharp { } static bool IsInvalidChar( char c ) { + bool isCP437 = Utils.ControlCharReplacements.IndexOf( c ) >= 0 || + Utils.ExtendedCharReplacements.IndexOf( c ) >= 0; // Make sure we're in the printable text range from 0x20 to 0x7E return c < ' ' || c == '&' || c > '~'; } @@ -166,6 +168,7 @@ namespace ClassicalSharp { allText = allText.Substring( 64 ); } game.Chat.Send( allText, false ); + return; } int packetsCount = 0; diff --git a/ClassicalSharp/Model/PlayerModel.cs b/ClassicalSharp/Model/PlayerModel.cs index bb1a3d77c..f0238d66a 100644 --- a/ClassicalSharp/Model/PlayerModel.cs +++ b/ClassicalSharp/Model/PlayerModel.cs @@ -23,7 +23,7 @@ namespace ClassicalSharp.Model { Set.Hat = BuildBox( MakeBoxBounds( -4, 24, -4, 4, 32, 4 ) .SetTexOrigin( 32, 0 ) .SetModelBounds( -4.5f, 23.5f, -4.5f, 4.5f, 32.5f, 4.5f ) ); - Set.LeftArm = BuildBox( MakeBoxBounds( -8, 12, -2, -4, 24, 2 ) + Set.LeftArm = BuildBox( MakeBoxBounds( -4, 12, -2, -8, 24, 2 ) .SetTexOrigin( 40, 16 ) ); Set.RightArm = BuildBox( MakeBoxBounds( 4, 12, -2, 8, 24, 2 ) .SetTexOrigin( 40, 16 ) );