From 3b7f0a6aeae205d586c7088fa0f6a76082770ae1 Mon Sep 17 00:00:00 2001 From: marc barbier Date: Sat, 9 Jan 2021 20:19:13 +0100 Subject: [PATCH] patch crash serveur --- bin/game/cards/Mythes/Mythes_Erinyes.class | Bin 549 -> 556 bytes src/game/cards/Mythes/Mythes_Erinyes.java | 4 ++-- src/game/cards/SpecialCard/DoubleBufCard.java | 8 ++++++-- .../cards/SpecialCard/ExtremeLonerCard.java | 2 +- src/game/cards/SpecialCard/HealthBufCard.java | 6 +++++- .../cards/SpecialCard/StrongifyBufCard.java | 5 ++++- 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/bin/game/cards/Mythes/Mythes_Erinyes.class b/bin/game/cards/Mythes/Mythes_Erinyes.class index dff95581a68cded3652a94f0982d37217645a850..4bd1467eb976c30934bbb5b5d57ad68aaa374264 100644 GIT binary patch delta 42 wcmZ3=vW8`Xsl0l6Vs5H_a$-?Rv3_ttYI0^`jx&&>?^;n(l$x8m(f0-;06mNkg#Z8m delta 35 pcmZ3(vXo_lsf0p$Vs5H_a$-?Rv3_ttYI0^`jx&&>zcJ(nBLLa345R=6 diff --git a/src/game/cards/Mythes/Mythes_Erinyes.java b/src/game/cards/Mythes/Mythes_Erinyes.java index 9792d69..77c8f87 100644 --- a/src/game/cards/Mythes/Mythes_Erinyes.java +++ b/src/game/cards/Mythes/Mythes_Erinyes.java @@ -1,8 +1,8 @@ package game.cards.Mythes; -import game.cards.SpecialCard.LonerCard; +import game.cards.SpecialCard.ExtremeLonerCard; -public class Mythes_Erinyes extends LonerCard{ +public class Mythes_Erinyes extends ExtremeLonerCard{ /** diff --git a/src/game/cards/SpecialCard/DoubleBufCard.java b/src/game/cards/SpecialCard/DoubleBufCard.java index 07034db..73c0992 100644 --- a/src/game/cards/SpecialCard/DoubleBufCard.java +++ b/src/game/cards/SpecialCard/DoubleBufCard.java @@ -13,8 +13,12 @@ public abstract class DoubleBufCard extends BufCard{ while(it.hasNext()) { Card card = it.next(); - card.heal(1); - card.makeStronger(1); + if(card != null) + { + card.heal(1); + card.makeStronger(1); + } + } } } diff --git a/src/game/cards/SpecialCard/ExtremeLonerCard.java b/src/game/cards/SpecialCard/ExtremeLonerCard.java index 37117e0..d50940b 100644 --- a/src/game/cards/SpecialCard/ExtremeLonerCard.java +++ b/src/game/cards/SpecialCard/ExtremeLonerCard.java @@ -6,7 +6,7 @@ import game.cards.Card; public abstract class ExtremeLonerCard extends Card{ @Override public void onCardPlaced(Board board) { - if(board.getBoardSize() == 1) + if(board.getBoardSize() != 1) { makeStronger(-2); heal(-2); diff --git a/src/game/cards/SpecialCard/HealthBufCard.java b/src/game/cards/SpecialCard/HealthBufCard.java index 2163359..af429f3 100644 --- a/src/game/cards/SpecialCard/HealthBufCard.java +++ b/src/game/cards/SpecialCard/HealthBufCard.java @@ -14,7 +14,11 @@ public abstract class HealthBufCard extends BufCard{ while(it.hasNext()) { Card card = it.next(); - card.heal(1); + if(card != null) + { + card.heal(1); + } + } } } diff --git a/src/game/cards/SpecialCard/StrongifyBufCard.java b/src/game/cards/SpecialCard/StrongifyBufCard.java index 857d96c..a6e14d5 100644 --- a/src/game/cards/SpecialCard/StrongifyBufCard.java +++ b/src/game/cards/SpecialCard/StrongifyBufCard.java @@ -13,7 +13,10 @@ public abstract class StrongifyBufCard extends BufCard{ while(it.hasNext()) { Card card = it.next(); - card.heal(1); + if(card != null) + { + card.heal(1); + } } } }