Merge branch 'issue4454try' of https://github.com/melissamcewen/habitrpg into melissamcewen-issue4454try

This commit is contained in:
Blade Barringer 2015-01-04 16:11:22 -06:00
commit ff3d942696

View file

@ -195,7 +195,7 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$
$scope.castStart = function(spell) {
if (User.user.stats.mp < spell.mana) return Notification.text(window.env.t('notEnoughMana'));
if (spell.key == 'nye' && User.user.stats.gp < spell.value)
if (spell.immediateUse && User.user.stats.gp < spell.value)
return Notification.text('Not enough gold.');
$rootScope.applyingAction = true;