diff --git a/backend/bang/players.py b/backend/bang/players.py index 15386c3..a32b8d1 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -973,7 +973,7 @@ class Player: self.notify_self() def holyday_special(self, data): - if self.character.check(self.game, chd.DocHolyday) and self.special_use_count < 1: + if self.character.check(self.game, chd.DocHolyday) and self.special_use_count < 1 and self.pending_action == PendingAction.PLAY: self.special_use_count += 1 cards = sorted(data['cards'], reverse=True) for c in cards: diff --git a/frontend/src/components/Player.vue b/frontend/src/components/Player.vue index 3c12388..a31fce1 100644 --- a/frontend/src/components/Player.vue +++ b/frontend/src/components/Player.vue @@ -24,7 +24,7 @@ - +
{{$t('hand')}} @@ -307,7 +307,7 @@ export default { }, holydayScrapBang(other) { this.$socket.emit('holyday_special', { - cards : [this.hand.indexOf(this.scrapHand[0]), this.hand.indexOf(this.scrapHand[1])], + cards : [this.scrapHand[0], this.scrapHand[1]], against: other.name }) this.scrapHand = []