From 88a599805678dc39c10c07de36a89fe4b2e563b5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Jun 2021 04:29:46 +0000 Subject: [PATCH 1/2] Bump core-js from 3.15.0 to 3.15.1 in /frontend Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.15.0 to 3.15.1. - [Release notes](https://github.com/zloirock/core-js/releases) - [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/zloirock/core-js/commits/v3.15.1/packages/core-js) --- updated-dependencies: - dependency-name: core-js dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 102bcae..b0fbc9e 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -8,7 +8,7 @@ "lint": "vue-cli-service lint" }, "dependencies": { - "core-js": "^3.15.0", + "core-js": "^3.15.1", "pretty-checkbox-vue": "^1.1.9", "register-service-worker": "^1.7.2", "socket.io-client": "^4.1.2", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 0259ada..48fc5f5 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -2929,10 +2929,10 @@ core-js@^2.4.0: resolved "https://registry.npm.taobao.org/core-js/download/core-js-2.6.12.tgz?cache=0&sync_timestamp=1606326948512&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcore-js%2Fdownload%2Fcore-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" integrity sha1-2TM9+nsGXjR8xWgiGdb2kIWcwuw= -core-js@^3.15.0, core-js@^3.6.5: - version "3.15.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.0.tgz#db9554ebce0b6fd90dc9b1f2465c841d2d055044" - integrity sha512-GUbtPllXMYRzIgHNZ4dTYTcUemls2cni83Q4Q/TrFONHfhcg9oEGOtaGHfb0cpzec60P96UKPvMkjX1jET8rUw== +core-js@^3.15.1, core-js@^3.6.5: + version "3.15.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.1.tgz#6c08ab88abdf56545045ccf5fd81f47f407e7f1a" + integrity sha512-h8VbZYnc9pDzueiS2610IULDkpFFPunHwIpl8yRwFahAEEdSpHlTy3h3z3rKq5h11CaUdBEeRViu9AYvbxiMeg== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" From 7a4e939eaf8a7c570c8c3764d5387328b5cad895 Mon Sep 17 00:00:00 2001 From: Giulio Date: Thu, 24 Jun 2021 10:22:27 +0200 Subject: [PATCH 2/2] fix draw manette indentation again --- backend/bang/players.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/bang/players.py b/backend/bang/players.py index c220a0d..af66efa 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -435,7 +435,7 @@ class Player: return self.notify_self() if self.game.check_event(ceh.IlTreno) or (self.is_ghost and self.game.check_event(ceh.CittaFantasma)): self.hand.append(self.game.deck.draw()) - self.manette() + self.manette() self.notify_self() def manette(self): @@ -688,6 +688,7 @@ class Player: self.pending_action = PendingAction.PLAY self.manette() self.notify_self() + # specifico per personaggio elif self.is_drawing and self.character.check(self.game, chd.PatBrennan): self.is_drawing = False card = self.available_cards.pop(card_index)