Add enable_pvp setting

diff --git a/minetest.conf.example b/minetest.conf.example
index cf27acfac1a05bdeffd75dac2670a85a6005935c..83519e145d610cd541c648da47ed58485411de1a 100644 (file)
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -133,6 +133,8 @@
 #default_privs = build, shout
 # Whether players are transferred to client without any range limit
 #unlimited_player_transfer_distance = true
+# Whether to enable players killing each other
+#enable_pvp = true
 
 # Profiler data print interval. #0 = disable.
 #profiler_print_interval = 0

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index be63fb8706b766d10f4977aadc13576593d9c1e5..1e48183fa028a537e6cc7a62faf539b799b616e5 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -94,6 +94,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("default_password", "");
        settings->setDefault("default_privs", "build, shout");
        settings->setDefault("unlimited_player_transfer_distance", "true");
+       settings->setDefault("enable_pvp", "true");
 
        settings->setDefault("profiler_print_interval", "0");
        settings->setDefault("enable_mapgen_debug_info", "false");

diff --git a/src/serverremoteplayer.cpp b/src/serverremoteplayer.cpp
index bff414e1a96756dce77e5b35502e81441bf0a85e..900cc54329466e6cb32048c3205a0cf636a896ca 100644 (file)
--- a/src/serverremoteplayer.cpp
+++ b/src/serverremoteplayer.cpp
@@ -139,6 +139,12 @@ void ServerRemotePlayer::punch(ServerActiveObject *puncher,
        if(!puncher)
                return;
        
+       // No effect if PvP disabled
+       if(g_settings->getBool("enable_pvp") == false){
+               if(puncher->getType() == ACTIVEOBJECT_TYPE_PLAYER)
+                       return;
+       }
+       
        // "Material" properties of a player
        MaterialProperties mp;
        mp.diggability = DIGGABLE_NORMAL;