From 9af0142a36f345c16db5ccabf75349c1b13f59e2 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Fri, 2 Dec 2011 11:25:47 +0200 Subject: Add enable_pvp setting --- src/serverremoteplayer.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/serverremoteplayer.cpp') diff --git a/src/serverremoteplayer.cpp b/src/serverremoteplayer.cpp index bff414e1a..900cc5432 100644 --- 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; -- cgit v1.2.3