From 308ad68c7f246f488069af67ddd77d4dac3cb13b Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Wed, 9 Nov 2022 09:28:03 +0800 Subject: [PATCH] improve readability --- forge-game/src/main/java/forge/game/zone/Zone.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/forge-game/src/main/java/forge/game/zone/Zone.java b/forge-game/src/main/java/forge/game/zone/Zone.java index 2a04c25c0d1..14a5e5f4a42 100644 --- a/forge-game/src/main/java/forge/game/zone/Zone.java +++ b/forge-game/src/main/java/forge/game/zone/Zone.java @@ -215,7 +215,9 @@ public class Zone implements java.io.Serializable, Iterable { return false; } if (cardsAddedThisTurn.get(origin).contains(card)) { - long ts = getCardsAddedThisTurn(origin).get(getCardsAddedThisTurn(origin).lastIndexOf(card)).getTimestamp(); + List cardsAddedThisTurnOrigin = getCardsAddedThisTurn(origin); + int cardIndexOrigin = cardsAddedThisTurnOrigin.lastIndexOf(card); + long cardTimestampOrigin = cardsAddedThisTurnOrigin.get(cardIndexOrigin).getTimestamp(); // need to check other zones if card didn't change again for (ZoneType z : cardsAddedThisTurn.keySet()) { if (z == origin) { @@ -223,9 +225,11 @@ public class Zone implements java.io.Serializable, Iterable { } if (cardsAddedThisTurn.get(z).contains(card)) { - long tsAlt = getCardsAddedThisTurn(z).get(getCardsAddedThisTurn(z).lastIndexOf(card)).getTimestamp(); + List cardsAddedThisTurnNonOrigin = getCardsAddedThisTurn(z); + int cardIndex = cardsAddedThisTurnNonOrigin.lastIndexOf(card); + long cardTimestamp = cardsAddedThisTurnNonOrigin.get(cardIndex).getTimestamp(); // the most recent version of this card did not come from the requested zone - if (tsAlt > ts) { + if (cardTimestamp > cardTimestampOrigin) { return false; } }