X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Fcl_physics.qc;h=bf555d4fcd173d4fa245f1635d7c610594c7d45e;hb=b0a06888ff894f9d334f6277b996f98ae8a665a0;hp=900f65bc8ab3dcbbe698f23ab906e7b5320f7601;hpb=9a2bcac8d6b0967c9b43f5a91cea80468f1cb8dd;p=xonotic%2Fxonotic-data.pk3dir.git

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;