diff --git a/ClassicalSharp/2D/Screens/ChatScreen.cs b/ClassicalSharp/2D/Screens/ChatScreen.cs index 216e960f6..67a11d694 100644 --- a/ClassicalSharp/2D/Screens/ChatScreen.cs +++ b/ClassicalSharp/2D/Screens/ChatScreen.cs @@ -276,7 +276,7 @@ namespace ClassicalSharp { suppressNextPress = false; if( HandlesAllInput ) { // text input bar - if( key == game.Mapping( KeyBinding.SendChat ) + if( key == game.Mapping( KeyBinding.SendChat ) || key == Key.KeypadEnter || key == game.Mapping( KeyBinding.PauseOrExit ) ) { HandlesAllInput = false; if( game.CursorVisible ) diff --git a/ClassicalSharp/2D/Widgets/Chat/TextInputWidget.Handlers.cs b/ClassicalSharp/2D/Widgets/Chat/TextInputWidget.Handlers.cs index 54d301625..8998b7b7d 100644 --- a/ClassicalSharp/2D/Widgets/Chat/TextInputWidget.Handlers.cs +++ b/ClassicalSharp/2D/Widgets/Chat/TextInputWidget.Handlers.cs @@ -105,6 +105,7 @@ namespace ClassicalSharp { caretPos -= len; if( caretPos < 0 ) caretPos = 0; + if( caretPos != 0 ) caretPos++; // Don't remove space. for( int i = 0; i <= len; i++ ) chatInputText.DeleteAt( caretPos ); diff --git a/ClassicalSharp/Entities/LocalPlayer.Physics.cs b/ClassicalSharp/Entities/LocalPlayer.Physics.cs index f0056ef4d..933b51b1f 100644 --- a/ClassicalSharp/Entities/LocalPlayer.Physics.cs +++ b/ClassicalSharp/Entities/LocalPlayer.Physics.cs @@ -173,9 +173,9 @@ namespace ClassicalSharp { float GetBaseMultiply() { float multiply = 0; if( flying || noClip ) { - if( speeding ) multiply += SpeedMultiplier * 9; - if( halfSpeeding ) multiply += SpeedMultiplier * 9 / 2; - if( multiply == 0 ) multiply = SpeedMultiplier * 1.5f; + if( speeding ) multiply += SpeedMultiplier * 8; + if( halfSpeeding ) multiply += SpeedMultiplier * 8 / 2; + if( multiply == 0 ) multiply = 8f; } else { if( speeding ) multiply += SpeedMultiplier; if( halfSpeeding ) multiply += SpeedMultiplier / 2; diff --git a/ClassicalSharp/Entities/LocalPlayer.cs b/ClassicalSharp/Entities/LocalPlayer.cs index 4a1fad900..696cd8016 100644 --- a/ClassicalSharp/Entities/LocalPlayer.cs +++ b/ClassicalSharp/Entities/LocalPlayer.cs @@ -59,7 +59,7 @@ namespace ClassicalSharp { public bool NoclipSlide = true; /// Whether the player has allowed the usage of fast double jumping abilities. - public bool DoubleJump = true; + public bool DoubleJump = false; /// Whether the player is allowed to double jump. public bool CanDoubleJump = true; @@ -81,6 +81,7 @@ namespace ClassicalSharp { SpeedMultiplier = Options.GetFloat( OptionsKey.Speed, 0.1f, 50, 7 ); PushbackPlacing = Options.GetBool( OptionsKey.PushbackPlacing, false ); NoclipSlide = Options.GetBool( OptionsKey.NoclipSlide, false ); + DoubleJump = Options.GetBool( OptionsKey.DoubleJump, false ); InitRenderingData(); } @@ -316,7 +317,7 @@ namespace ClassicalSharp { flying = !flying; } else if( key == keys[KeyBinding.NoClip] && CanNoclip && HacksEnabled ) { noClip = !noClip; - } else if( key == keys[KeyBinding.Jump] && !onGround ) { + } else if( key == keys[KeyBinding.Jump] && !onGround && !(flying || noClip) ) { if( firstJump && CanDoubleJump && DoubleJump ) { DoNormalJump(); firstJump = false;