X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_client.qc;h=58d25b0e73474761c2a3d53797a31903456bb44e;hb=1b2f61baeeff5a7d004fafd3cfdd8269a0338a1e;hp=bddb5933233ba91f7d422a85820852276344722e;hpb=a9f034bd247570b2b06c435599db8e283c1a42de;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index bddb59332..58d25b0e7 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -2943,7 +2943,7 @@ void PlayerPreThink (void)
 
 		self.prevorigin = self.origin;
 
-		if ((self.BUTTON_CROUCH && !self.hook.state) || self.health <= g_bloodloss)
+		if (((self.BUTTON_CROUCH && !self.hook.state) || self.health <= g_bloodloss) && self.animstate_startframe != self.anim_melee_x) // prevent crouching if using melee attack
 		{
 			if (!self.crouch)
 			{