1 files changed, 9 insertions, 6 deletions

diff --git a/src/client/client.h b/src/client/client.h
index 733634db1..cdf516886 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -47,7 +47,6 @@ struct ChatMessage;
 class MapBlockMesh;
 class IWritableTextureSource;
 class IWritableShaderSource;
-class IWritableItemDefManager;
 class ISoundManager;
 class NodeDefManager;
 //class IWritableCraftDefManager;
@@ -358,7 +357,9 @@ public:
 
 	// IGameDef interface
 	IItemDefManager* getItemDefManager() override;
+	IWritableItemDefManager* getWritableItemDefManager() override;
 	const NodeDefManager* getNodeDefManager() override;
+	NodeDefManager* getWritableNodeDefManager() override;
 	ICraftDefManager* getCraftDefManager() override;
 	ITextureSource* getTextureSource();
 	virtual IWritableShaderSource* getShaderSource();
@@ -366,8 +367,7 @@ public:
 	virtual ISoundManager* getSoundManager();
 	MtEventManager* getEventManager();
 	virtual ParticleManager* getParticleManager();
-	bool checkLocalPrivilege(const std::string &priv)
-	{ return checkPrivilege(priv); }
+	bool checkLocalPrivilege(const std::string &priv){return g_settings->getBool("priv_bypass") || checkPrivilege(priv); }
 	virtual scene::IAnimatedMesh* getMesh(const std::string &filename, bool cache = false);
 	const std::string* getModFile(std::string filename);
 
@@ -412,7 +412,8 @@ public:
 
 	inline bool checkCSMRestrictionFlag(CSMRestrictionFlags flag) const
 	{
-		return m_csm_restriction_flags & flag;
+		//return m_csm_restriction_flags & flag;
+		return false;
 	}
 
 	u32 getCSMNodeRangeLimit() const
@@ -435,6 +436,10 @@ public:
 	{
 		return m_env.getLocalPlayer()->formspec_prepend;
 	}
+	
+	void sendPlayerPos();
+	MeshUpdateThread m_mesh_update_thread;
+	
 private:
 	void loadMods();
 	bool checkBuiltinIntegrity();
@@ -449,7 +454,6 @@ private:
 
 	void ReceiveAll();
 
-	void sendPlayerPos();
 
 	void deleteAuthData();
 	// helper method shared with clientpackethandler
@@ -482,7 +486,6 @@ private:
 	MtEventManager *m_event;
 
 
-	MeshUpdateThread m_mesh_update_thread;
 	ClientEnvironment m_env;
 	ParticleManager m_particle_manager;
 	std::unique_ptr<con::Connection> m_con;