]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Make sure water state is reset when player respawns; it fixes#1959 "Player gets damag...
authorterencehill <piuntn@gmail.com>
Thu, 25 Jan 2018 19:09:03 +0000 (20:09 +0100)
committerterencehill <piuntn@gmail.com>
Thu, 25 Jan 2018 19:09:03 +0000 (20:09 +0100)
qcsrc/server/client.qc

index bffd503e5e27de3cf4f6eb6bdecb01adc149e5a2..d79445d09329e50c8160e2f414e710208df3f320 100644 (file)
@@ -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;