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

Removed user.party.quest.key checks from isOnQuest. They are no longer accurate checks due to changes made in #5298

Browse Source
This commit is contained in:
hairlessbear
2015-06-29 13:12:29 -04:00
parent 2f48534342
commit 0b1cc5f0ea
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -193,13 +193,13 @@ GroupSchema.methods.finishQuest = function(quest, cb) {
mongoose.model('User').update(q, updates, {multi:true}, cb);
}
function isOnQuest(user,progress,group){
return group && progress && user.party.quest.key && group.quest && user.party.quest.key == group.quest.key && group.quest.active;
function isOnQuest(progress,group){
return group && progress && group.quest && group.quest.active;
}
GroupSchema.statics.collectQuest = function(user, progress, cb) {
this.findOne({type: 'party', members: {'$in': [user._id]}},function(err, group){
if (!isOnQuest(user,progress,group)) return cb(null);
if (!isOnQuest(progress,group)) return cb(null);
var quest = shared.content.quests[group.quest.key];
_.each(progress.collect,function(v,k){
@@ -302,7 +302,7 @@ GroupSchema.statics.tavernBoss = function(user,progress) {
GroupSchema.statics.bossQuest = function(user, progress, cb) {
this.findOne({type: 'party', members: {'$in': [user._id]}},function(err, group){
if (!isOnQuest(user,progress,group)) return cb(null);
if (!isOnQuest(progress,group)) return cb(null);
var quest = shared.content.quests[group.quest.key];
if (!progress || !quest) return cb(null); // FIXME why is this ever happening, progress should be defined at this point
var down = progress.down * quest.boss.str; // multiply by boss strength