From 2655abc808ea06398470bb109d365f8ac4fcf9ae Mon Sep 17 00:00:00 2001
From: sumoomus <>
Date: Wed, 24 Jun 2020 19:57:55 -0400
Subject: [PATCH] reverted clientenvironment.cpp and localplayer.cpp to
 original because the changes were unnecessary (see client.h)

---
 src/client/clientenvironment.cpp |  3 +--
 src/client/localplayer.cpp       | 15 +++++----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/client/clientenvironment.cpp b/src/client/clientenvironment.cpp
index 4cf22e0..be1eb9b 100644
--- a/src/client/clientenvironment.cpp
+++ b/src/client/clientenvironment.cpp
@@ -92,8 +92,7 @@ void ClientEnvironment::step(float dtime)
 	stepTimeOfDay(dtime);
 
 	// Get some settings
-	//bool fly_allowed = m_client->checkLocalPrivilege("fly");
-	bool fly_allowed = true; //toggled using default keybind
+	bool fly_allowed = m_client->checkLocalPrivilege("fly");
 	bool free_move = fly_allowed && g_settings->getBool("free_move");
 
 	// Get local player
diff --git a/src/client/localplayer.cpp b/src/client/localplayer.cpp
index 9254e4b..7e7b1a8 100644
--- a/src/client/localplayer.cpp
+++ b/src/client/localplayer.cpp
@@ -194,10 +194,8 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,
 	PlayerSettings &player_settings = getPlayerSettings();
 
 	// Skip collision detection if noclip mode is used
-	//bool fly_allowed = m_client->checkLocalPrivilege("fly");
-	bool fly_allowed = true; //toggled using default keybind
-	//bool noclip = m_client->checkLocalPrivilege("noclip") && player_settings.noclip;
-	bool noclip = true && player_settings.noclip; //default keybind
+	bool fly_allowed = m_client->checkLocalPrivilege("fly");
+	bool noclip = m_client->checkLocalPrivilege("noclip") && player_settings.noclip;
 	bool free_move = player_settings.free_move && fly_allowed;
 
 	if (noclip && free_move) {
@@ -490,8 +488,7 @@ void LocalPlayer::applyControl(float dtime, Environment *env)
 	v3f speedH = v3f(0,0,0); // Horizontal (X, Z)
 	v3f speedV = v3f(0,0,0); // Vertical (Y)
 
-	//bool fly_allowed = m_client->checkLocalPrivilege("fly");
-	bool fly_allowed = true; //toggled using default keybind
+	bool fly_allowed = m_client->checkLocalPrivilege("fly");
 	bool fast_allowed = m_client->checkLocalPrivilege("fast");
 
 	bool free_move = fly_allowed && player_settings.free_move;
@@ -803,10 +800,8 @@ void LocalPlayer::old_move(f32 dtime, Environment *env, f32 pos_max_d,
 	PlayerSettings &player_settings = getPlayerSettings();
 
 	// Skip collision detection if noclip mode is used
-	//bool fly_allowed = m_client->checkLocalPrivilege("fly");
-	bool fly_allowed = true; //toggled using default keybind
-	//bool noclip = m_client->checkLocalPrivilege("noclip") && player_settings.noclip;
-	bool noclip = true && player_settings.noclip; //default keybind
+	bool fly_allowed = m_client->checkLocalPrivilege("fly");
+	bool noclip = m_client->checkLocalPrivilege("noclip") && player_settings.noclip;
 	bool free_move = noclip && fly_allowed && player_settings.free_move;
 	if (free_move) {
 		position += m_speed * dtime;