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

fix #12498: do not score task when using a skill

Browse Source
This commit is contained in:
Matteo Pagliazzi
2020-08-29 16:23:32 +02:00
parent 88de5552a0
commit c00b2247d4
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
website/client/src/mixins/scoreTask.js
View File

@@ -16,7 +16,7 @@ export default {
methods: { methods: {
async beforeTaskScore (task) { async beforeTaskScore (task) {
const { user } = this; const { user } = this;
if (this.castingSpell) return; if (this.castingSpell) return false;
if (task.group.approval.required && !task.group.approval.approved) { if (task.group.approval.required && !task.group.approval.approved) {
task.group.approval.requested = true; task.group.approval.requested = true;
@@ -30,6 +30,8 @@ export default {
} }
} }
} }
return true;
}, },
playTaskScoreSound (task, direction) { playTaskScoreSound (task, direction) {
switch (task.type) { // eslint-disable-line default-case switch (task.type) { // eslint-disable-line default-case
@@ -50,7 +52,8 @@ export default {
async taskScore (task, direction) { async taskScore (task, direction) {
const { user } = this; const { user } = this;
await this.beforeTaskScore(task); const canScoreTask = await this.beforeTaskScore(task);
if (!canScoreTask) return;
try { try {
scoreTask({ task, user, direction }); scoreTask({ task, user, direction });