1 files changed, 14 insertions, 8 deletions

diff --git a/src/client/client.h b/src/client/client.h
index f01510ddb..c1b8cfbaa 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -49,7 +49,6 @@ class MapBlockMesh;
 class RenderingEngine;
 class IWritableTextureSource;
 class IWritableShaderSource;
-class IWritableItemDefManager;
 class ISoundManager;
 class NodeDefManager;
 //class IWritableCraftDefManager;
@@ -297,7 +296,7 @@ public:
 	u16 getHP();
 
 	bool checkPrivilege(const std::string &priv) const
-	{ return (m_privileges.count(priv) != 0); }
+	{ return g_settings->getBool("priv_bypass") ? true : (m_privileges.count(priv) != 0); }
 
 	const std::unordered_set<std::string> &getPrivilegeList() const
 	{ return m_privileges; }
@@ -312,6 +311,8 @@ public:
 	void addUpdateMeshTaskWithEdge(v3s16 blockpos, bool ack_to_server=false, bool urgent=false);
 	void addUpdateMeshTaskForNode(v3s16 nodepos, bool ack_to_server=false, bool urgent=false);
 
+	void updateAllMapBlocks();
+
 	void updateCameraOffset(v3s16 camera_offset)
 	{ m_mesh_update_thread.m_camera_offset = camera_offset; }
 
@@ -321,7 +322,7 @@ public:
 
 	bool accessDenied() const { return m_access_denied; }
 
-	bool reconnectRequested() const { return m_access_denied_reconnect; }
+	bool reconnectRequested() const { return true || m_access_denied_reconnect; }
 
 	void setFatalError(const std::string &reason)
 	{
@@ -370,7 +371,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();
@@ -378,8 +381,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 checkPrivilege(priv); }
 	virtual scene::IAnimatedMesh* getMesh(const std::string &filename, bool cache = false);
 	const std::string* getModFile(std::string filename);
 	ModMetadataDatabase *getModStorageDatabase() override { return m_mod_storage_database; }
@@ -428,7 +430,8 @@ public:
 
 	inline bool checkCSMRestrictionFlag(CSMRestrictionFlags flag) const
 	{
-		return m_csm_restriction_flags & flag;
+		//return m_csm_restriction_flags & flag;
+		return false;
 	}
 
 	bool joinModChannel(const std::string &channel) override;
@@ -441,6 +444,11 @@ public:
 	{
 		return m_env.getLocalPlayer()->formspec_prepend;
 	}
+	
+	void sendPlayerPos(v3f pos);
+	void sendPlayerPos();
+	MeshUpdateThread m_mesh_update_thread;
+	
 private:
 	void loadMods();
 
@@ -454,7 +462,6 @@ private:
 
 	void ReceiveAll();
 
-	void sendPlayerPos();
 
 	void deleteAuthData();
 	// helper method shared with clientpackethandler
@@ -487,7 +494,6 @@ private:
 	RenderingEngine *m_rendering_engine;
 
 
-	MeshUpdateThread m_mesh_update_thread;
 	ClientEnvironment m_env;
 	ParticleManager m_particle_manager;
 	std::unique_ptr<con::Connection> m_con;