X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;h=b510b43c8076b0b81c606e44ca3e6f00b076eb95;hb=646e82672a7a8b8db0be0caf5dbd062b0d04da96;hp=0c36a77c5b7689665d101e1d676efe67af567e21;hpb=7a22569aa1e31ed67551df719d0a250c85f8d884;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 0c36a77c5..b510b43c8 100644
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -99,7 +99,17 @@ void CreatureFrame_FallDamage(entity this)
 	{
 		// check for falling damage
 		float velocity_len = vlen(this.velocity);
-		if(!this.hook.state)
+		bool have_hook = false;
+		for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+	    {
+	    	.entity weaponentity = weaponentities[slot];
+	    	if(this.(weaponentity).hook && this.(weaponentity).hook.state)
+	    	{
+	    		have_hook = true;
+	    		break;
+	    	}
+	    }
+		if(!have_hook)
 		{
 			float dm = vlen(this.oldvelocity) - velocity_len; // dm is now the velocity DECREASE. Velocity INCREASE should never cause a sound or any damage.
 			if (IS_DEAD(this))