From: TimePath <andrew.hardaker1995@gmail.com>
Date: Mon, 29 Dec 2014 00:42:17 +0000 (+1100)
Subject: Check for jetpack activation, fixes #1438
X-Git-Tag: xonotic-v0.8.0~41^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ecf545589f9da4da54378cb19bfdc377363276bf;p=xonotic%2Fxonotic-data.pk3dir.git

Check for jetpack activation, fixes #1438
Check for jetpack, fixes #1439
---

diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc
index 900f65bc8..bf555d4fc 100644
--- a/qcsrc/server/cl_physics.qc
+++ b/qcsrc/server/cl_physics.qc
@@ -169,12 +169,13 @@ void CheckPlayerJump()
 		float air_jump = !PlayerJump() || self.multijump_count > 0; // PlayerJump() has important side effects
 		float activate = self.cvar_cl_jetpack_jump && air_jump && self.BUTTON_JUMP || self.BUTTON_JETPACK;
 		float has_fuel = !autocvar_g_jetpack_fuel || self.ammo_fuel || self.items & IT_UNLIMITED_WEAPON_AMMO;
-		if (self.jetpack_stopped) { }
+		if (!(self.items & IT_JETPACK)) { }
+		else if (self.jetpack_stopped) { }
 		else if (!has_fuel)
 		{
 			if (was_flying) // TODO: ran out of fuel message
 				Send_Notification(NOTIF_ONE, self, MSG_INFO, INFO_JETPACK_NOFUEL);
-			else
+			else if (activate)
 				Send_Notification(NOTIF_ONE, self, MSG_INFO, INFO_JETPACK_NOFUEL);
 			self.jetpack_stopped = TRUE;
 			self.items &= ~IT_USING_JETPACK;