mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-08-02 07:49:39 +00:00
do not allow user to revive if not dead, fixes HabitRPG/habitrpg#3599
This commit is contained in:
parent
7e573bc877
commit
e692b4b392
2 changed files with 10 additions and 2 deletions
10
dist/habitrpg-shared.js
vendored
10
dist/habitrpg-shared.js
vendored
|
|
@ -14148,6 +14148,12 @@ api.wrap = function(user, main) {
|
|||
},
|
||||
revive: function(req, cb) {
|
||||
var item, lostItem, lostStat;
|
||||
if (!(user.stats.hp > 0)) {
|
||||
return typeof cb === "function" ? cb({
|
||||
code: 400,
|
||||
message: "Cannot revive if not dead"
|
||||
}) : void 0;
|
||||
}
|
||||
_.merge(user.stats, {
|
||||
hp: 50,
|
||||
exp: 0,
|
||||
|
|
@ -15649,5 +15655,5 @@ api.wrap = function(user, main) {
|
|||
};
|
||||
|
||||
|
||||
}).call(this,require("/Users/lefnire/Dropbox/Sites/habitrpg/modules/habitrpg-shared/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js"))
|
||||
},{"./content.coffee":5,"./i18n.coffee":6,"/Users/lefnire/Dropbox/Sites/habitrpg/modules/habitrpg-shared/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js":2,"lodash":3,"moment":4}]},{},[1])
|
||||
}).call(this,require("/home/matteo/Dev/habitrpg/habitrpg-shared/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js"))
|
||||
},{"./content.coffee":5,"./i18n.coffee":6,"/home/matteo/Dev/habitrpg/habitrpg-shared/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js":2,"lodash":3,"moment":4}]},{},[1])
|
||||
|
|
@ -384,6 +384,8 @@ api.wrap = (user, main=true) ->
|
|||
cb? null, {}
|
||||
|
||||
revive: (req, cb) ->
|
||||
return cb?({code:400, message: "Cannot revive if not dead"}) unless user.stats.hp > 0
|
||||
|
||||
# Reset stats
|
||||
_.merge user.stats, {hp:50, exp:0, gp:0}
|
||||
user.stats.lvl-- if user.stats.lvl > 1
|
||||
|
|
|
|||
Loading…
Reference in a new issue