From 8f44833eb9febed681648274da598de53687dab4 Mon Sep 17 00:00:00 2001
From: rubenwardy <rubenwardy@gmail.com>
Date: Tue, 1 Sep 2015 18:28:40 +0100
Subject: [PATCH] Disable friendly fire

---
 minetest.conf       | 1 +
 mods/ctf_pvp_engine | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/minetest.conf b/minetest.conf
index 9c38319..57de80f 100644
--- a/minetest.conf
+++ b/minetest.conf
@@ -10,6 +10,7 @@ ctf.allocate_mode = 3
 ctf.diplomacy = false
 ctf.players_can_change_team = false
 ctf.node_ownership = false
+ctf.friendly_fire = false
 ctf.match = true
 ctf.match.teams = red, red, 15, 7, 39; blue, blue, -9, 9, -43
 ctf.match.clear_inv = true
diff --git a/mods/ctf_pvp_engine b/mods/ctf_pvp_engine
index cd3bd99..665030b 160000
--- a/mods/ctf_pvp_engine
+++ b/mods/ctf_pvp_engine
@@ -1 +1 @@
-Subproject commit cd3bd99f3b1f589559a0e7d5a31a246bac7f54c4
+Subproject commit 665030b5d5c3858197e34922e6e7473e0db68233