From: TimePath <andrew.hardaker1995@gmail.com>
Date: Tue, 13 Oct 2015 07:52:58 +0000 (+1100)
Subject: Nades: don't forget to think
X-Git-Tag: xonotic-v0.8.2~1833
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5e504bae6cfc01a24dd6dc2e673a35d80c8a1759;p=xonotic%2Fxonotic-data.pk3dir.git

Nades: don't forget to think

Closes #1571
---

diff --git a/qcsrc/server/mutators/mutator_nades.qc b/qcsrc/server/mutators/mutator_nades.qc
index f665fbc13..1b4b7ddc5 100644
--- a/qcsrc/server/mutators/mutator_nades.qc
+++ b/qcsrc/server/mutators/mutator_nades.qc
@@ -964,7 +964,7 @@ MUTATOR_HOOKFUNCTION(nades_PlayerPreThink)
 {SELFPARAM();
 	if (!IS_PLAYER(self)) { return false; }
 
-	if (self.nade && self.offhand != OFFHAND_NADE) OFFHAND_NADE.offhand_think(OFFHAND_NADE, self, self.nade_altbutton);
+	if (self.nade && (self.offhand != OFFHAND_NADE || (self.weapons & WEPSET(HOOK)))) OFFHAND_NADE.offhand_think(OFFHAND_NADE, self, self.nade_altbutton);
 
 	if(IS_PLAYER(self))
 	{