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

Correct assinging of tavernQuest object when boss damage is calculated

Browse Source
This commit is contained in:
Blade Barringer
2015-10-08 08:32:40 -05:00
parent 9e88d17a78
commit 5e10b8f4c9
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
website/src/models/group.js
View File

@@ -273,6 +273,8 @@ module.exports.tavernQuest = {};
var tavernQ = {_id:'habitrpg','quest.key':{$ne:null}};
process.nextTick(function(){
mongoose.model('Group').findOne(tavernQ, function(err,tavern){
if (!tavern) return; // No tavern quest
var quest = tavern.quest.toObject();
// Using _assign so we don't lose the reference to the exported tavernQuest
_.assign(module.exports.tavernQuest, quest);
@@ -292,7 +294,6 @@ GroupSchema.statics.tavernBoss = function(user,progress) {
},
function(tavern,cb){
if (!(tavern && tavern.quest && tavern.quest.key)) return cb(true);
module.exports.tavernQuest = tavern.quest.toObject();
var quest = shared.content.quests[tavern.quest.key];
if (tavern.quest.progress.hp <= 0) {
@@ -331,6 +332,8 @@ GroupSchema.statics.tavernBoss = function(user,progress) {
tavern.quest.extra.str = quest.boss.desperation.str;
tavern.markModified('quest.extra');
}
_.assign(module.exports.tavernQuest, tavern.quest.toObject());
tavern.save(cb);
}
}