From: Mario <mario.mario@y7mail.com>
Date: Sat, 23 May 2020 14:04:16 +0000 (+1000)
Subject: Ignore client dodging setting while frozen, to allow hopping around on servers that... 
X-Git-Tag: xonotic-v0.8.5~1040
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=b683c8b5680a2c4c4710826675d08b3ac4ba7400

Ignore client dodging setting while frozen, to allow hopping around on servers that enable it
---

diff --git a/qcsrc/common/mutators/mutator/dodging/sv_dodging.qc b/qcsrc/common/mutators/mutator/dodging/sv_dodging.qc
index 3651e9aa07..19f8b1046c 100644
--- a/qcsrc/common/mutators/mutator/dodging/sv_dodging.qc
+++ b/qcsrc/common/mutators/mutator/dodging/sv_dodging.qc
@@ -221,7 +221,8 @@ void PM_dodging(entity this)
 	if (!this.dodging_action) return;
 
 	// when swimming or dead, no dodging allowed..
-	if (this.waterlevel >= WATERLEVEL_SWIMMING || IS_DEAD(this) || (PHYS_DODGING_CLIENTSELECT && !PHYS_DODGING_ENABLED(this)))
+	bool frozen_dodging = (PHYS_FROZEN(this) && PHYS_DODGING_FROZEN(this));
+	if (this.waterlevel >= WATERLEVEL_SWIMMING || IS_DEAD(this) || (PHYS_DODGING_CLIENTSELECT && !PHYS_DODGING_ENABLED(this) && !frozen_dodging))
 	{
 		this.dodging_action = 0;
 		this.dodging_direction.x = 0;