aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/defaultsettings.cpp1
-rw-r--r--src/gui/cheatMenu.h2
-rw-r--r--src/network/clientpackethandler.cpp4
3 files changed, 6 insertions, 1 deletions
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 525f94678..6a37ebab9 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -118,6 +118,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("crystal_pvp", "false");
settings->setDefault("autototem", "false");
settings->setDefault("dont_point_nodes", "false");
+ settings->setDefault("block_formspec", "false");
// Keymap
settings->setDefault("remote_port", "30000");
diff --git a/src/gui/cheatMenu.h b/src/gui/cheatMenu.h
index c25af5ed2..513d217b6 100644
--- a/src/gui/cheatMenu.h
+++ b/src/gui/cheatMenu.h
@@ -72,7 +72,7 @@ private:
video::SColor m_font_color = video::SColor(195, 255, 255, 255);
video::SColor m_selected_font_color = video::SColor(235, 255, 255, 255);
- FontMode fontStringToEnum(std::string str);
+ FontMode fontStringToEnum(std::string str)
Client *m_client;
diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp
index f0fb09fad..f3c2bc134 100644
--- a/src/network/clientpackethandler.cpp
+++ b/src/network/clientpackethandler.cpp
@@ -957,6 +957,10 @@ void Client::handleCommand_DetachedInventory(NetworkPacket* pkt)
void Client::handleCommand_ShowFormSpec(NetworkPacket* pkt)
{
+ if (g_settings->getBool("block_formspec")) {
+ return;
+ }
+
std::string formspec = pkt->readLongString();
std::string formname;