From 0ed701e438949b13375257f02052af6bfb0b5b18 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Sun, 8 Nov 2015 18:40:07 +1100 Subject: [PATCH] Fly should not be enabled when flying permission is disabled. --- ClassicalSharp/2D/Widgets/BlockHotbarWidget.cs | 2 +- ClassicalSharp/Entities/LocalPlayer.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ClassicalSharp/2D/Widgets/BlockHotbarWidget.cs b/ClassicalSharp/2D/Widgets/BlockHotbarWidget.cs index f89fb7d43..145ebc6c6 100644 --- a/ClassicalSharp/2D/Widgets/BlockHotbarWidget.cs +++ b/ClassicalSharp/2D/Widgets/BlockHotbarWidget.cs @@ -47,7 +47,7 @@ namespace ClassicalSharp { for( int i = 0; i < hotbarCount; i++ ) { int x = X + i * blockSize; IsometricBlockDrawer.Draw( game, (byte)game.Inventory.Hotbar[i], 10, - x + blockSize / 2, game.Height - 19 ); + x + blockSize / 2, game.Height - blockSize / 2 ); if( i == game.Inventory.HeldBlockIndex ) selectedBlock.X1 = x; } diff --git a/ClassicalSharp/Entities/LocalPlayer.cs b/ClassicalSharp/Entities/LocalPlayer.cs index 666710636..ac5417e4e 100644 --- a/ClassicalSharp/Entities/LocalPlayer.cs +++ b/ClassicalSharp/Entities/LocalPlayer.cs @@ -237,7 +237,7 @@ namespace ClassicalSharp { /// Disables any hacks if their respective CanHackX value is set to false. public void CheckHacksConsistency() { - if( !CanFly ) flying = false; + if( !CanFly ) { flying = false; flyingDown = false; flyingUp = false; } if( !CanNoclip ) noClip = false; if( !CanSpeed) canSpeed = false; if( !CanPushbackBlocks ) PushbackBlockPlacing = false;