From: Mario <mario.mario@y7mail.com>
Date: Sun, 9 Oct 2022 11:49:48 +0000 (+1000)
Subject: Remove sv_gameplayfix_unstickplayers 2 as it is no longer necessary
X-Git-Tag: xonotic-v0.8.6~332^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e32294da8b1c948ac56c25a2aac9072e5376ee83;p=xonotic%2Fxonotic-data.pk3dir.git

Remove sv_gameplayfix_unstickplayers 2 as it is no longer necessary
---

diff --git a/qcsrc/common/physics/movetypes/movetypes.qc b/qcsrc/common/physics/movetypes/movetypes.qc
index 48aa9dd10..93cf2a4d3 100644
--- a/qcsrc/common/physics/movetypes/movetypes.qc
+++ b/qcsrc/common/physics/movetypes/movetypes.qc
@@ -782,15 +782,11 @@ void _Movetype_Physics_ClientFrame(entity this, float movedt)
 			this.angles = this.angles + movedt * this.avelocity;
 			break;
 		case MOVETYPE_STEP:
-			if (GAMEPLAYFIX_UNSTICKPLAYERS(this) == 2)
-				_Movetype_CheckStuck(this);
 			_Movetype_Physics_Step(this, movedt);
 			break;
 		case MOVETYPE_WALK:
 		case MOVETYPE_FLY:
 		case MOVETYPE_FLY_WORLDONLY:
-			if (movedt > 0 && GAMEPLAYFIX_UNSTICKPLAYERS(this) == 2)
-				_Movetype_CheckStuck(this);
 			_Movetype_Physics_Walk(this, movedt);
 			break;
 		case MOVETYPE_TOSS:
diff --git a/qcsrc/common/physics/movetypes/walk.qc b/qcsrc/common/physics/movetypes/walk.qc
index da6d4cfc3..babb38ca4 100644
--- a/qcsrc/common/physics/movetypes/walk.qc
+++ b/qcsrc/common/physics/movetypes/walk.qc
@@ -6,7 +6,7 @@ void _Movetype_Physics_Walk(entity this, float dt)  // SV_WalkMove
 	if (dt <= 0)
 		return;
 
-	if (GAMEPLAYFIX_UNSTICKPLAYERS(this) == 1)
+	if (GAMEPLAYFIX_UNSTICKPLAYERS(this))
 		_Movetype_CheckStuck(this);
 
 	bool applygravity = (!_Movetype_CheckWater(this) && this.move_movetype == MOVETYPE_WALK && !(this.flags & FL_WATERJUMP));