From 0d6fd977a664fc6a65419bc0eaa2ad609d193e08 Mon Sep 17 00:00:00 2001 From: terencehill Date: Thu, 25 Jan 2018 20:09:03 +0100 Subject: [PATCH] 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 --- qcsrc/server/client.qc | 3 +++ 1 file changed, 3 insertions(+) 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; -- 2.39.2