From: terencehill <piuntn@gmail.com>
Date: Thu, 25 Jan 2018 19:09:03 +0000 (+0100)
Subject: Make sure water state is reset when player respawns; it fixes#1959 "Player gets damag... 
X-Git-Tag: xonotic-v0.8.5~2370
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0d6fd977a664fc6a65419bc0eaa2ad609d193e08;p=xonotic%2Fxonotic-data.pk3dir.git

Make sure water state is reset when player respawns; it fixes#1959 "Player gets damage at match start when he ends warmup in lava" if sv _ready_restart_after_countdown 1 &&  g_spawnshieldtime 0
---

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index bffd503e5..d79445d09 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -617,7 +617,10 @@ void PutPlayerInServer(entity this)
 	this.fire_endtime = -1;
 	this.revive_progress = 0;
 	this.revival_time = 0;
+
 	this.air_finished = time + 12;
+	this.waterlevel = WATERLEVEL_NONE;
+	this.watertype = CONTENT_EMPTY;
 
 	entity spawnevent = new_pure(spawnevent);
 	spawnevent.owner = this;