krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 07:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(modals): Rehatch pets

Browse Source 
Corrects an issue with #6281 that would cause the pet hatching modal to fail to display if the pet had a value of -1 (i.e. raised to a mount and not yet re-hatched).
This commit is contained in:
Sabe Jones
2015-11-30 16:11:13 -05:00
parent a42c671f1f
commit 3a20455cda
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/public/js/controllers/inventoryCtrl.js
View File

@@ -115,7 +115,7 @@ habitrpg.controller("InventoryCtrl",
var potName = Content.hatchingPotions[potion.key].text();
if (!$window.confirm(window.env.t('hatchAPot', {potion: potName, egg: eggName}))) return;
var userHasPet = user.items.pets[egg.key + '-' + potion.key];
var userHasPet = (user.items.pets[egg.key + '-' + potion.key] > 0) ? true:false;
user.ops.hatch({params:{egg:egg.key, hatchingPotion:potion.key}});