From: Slava Bacherikov <slava@bacher09.org>
Date: Wed, 8 Apr 2020 19:38:33 +0000 (+0300)
Subject: Fix bug with lava and flag
X-Git-Tag: xonotic-v0.8.5~1107^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5bd759afaa2272663e69a8b4973dc7c53ed192f4;p=xonotic%2Fxonotic-data.pk3dir.git

Fix bug with lava and flag
---

diff --git a/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
index cfe8d4058..5e508637d 100644
--- a/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
+++ b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
@@ -1147,6 +1147,7 @@ METHOD(Flag, giveTo, bool(Flag this, entity flag, entity toucher))
 .float last_respawn;
 void ctf_RespawnFlag(entity flag)
 {
+	flag.watertype = CONTENT_EMPTY;
 	// check for flag respawn being called twice in a row
 	if(flag.last_respawn > time - 0.5)
 		{ backtrace("flag respawn called twice quickly! please notify Samual about this..."); }