From: TimePath <andrew.hardaker1995@gmail.com>
Date: Tue, 6 Oct 2015 00:56:00 +0000 (+1100)
Subject: Nades: always throw with weapon drop in case offhand is occupied
X-Git-Tag: xonotic-v0.8.2~1874^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e95082e3dbb7cb2b54189dc05fb923c768babad7;p=xonotic%2Fxonotic-data.pk3dir.git

Nades: always throw with weapon drop in case offhand is occupied
---

diff --git a/qcsrc/server/mutators/mutator_nades.qc b/qcsrc/server/mutators/mutator_nades.qc
index 98511b238..fd2ce00a2 100644
--- a/qcsrc/server/mutators/mutator_nades.qc
+++ b/qcsrc/server/mutators/mutator_nades.qc
@@ -907,7 +907,10 @@ void nades_Clear(entity player)
 
 MUTATOR_HOOKFUNCTION(nades_CheckThrow)
 {
-	if(MUTATOR_RETURNVALUE) { nades_CheckThrow(); }
+	if (self.offhand) {
+		nades_CheckThrow();
+		return true;
+	}
 	return false;
 }