external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve readability

Browse Source
This commit is contained in:
Anthony Calosa
2022-11-09 09:28:03 +08:00
committed by GitHub
parent cf0222f80d
commit 308ad68c7f
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-game/src/main/java/forge/game/zone/Zone.java
View File

@@ -215,7 +215,9 @@ public class Zone implements java.io.Serializable, Iterable<Card> {
return false; return false;
} }
if (cardsAddedThisTurn.get(origin).contains(card)) { if (cardsAddedThisTurn.get(origin).contains(card)) {
long ts = getCardsAddedThisTurn(origin).get(getCardsAddedThisTurn(origin).lastIndexOf(card)).getTimestamp(); List<Card> 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 // need to check other zones if card didn't change again
for (ZoneType z : cardsAddedThisTurn.keySet()) { for (ZoneType z : cardsAddedThisTurn.keySet()) {
if (z == origin) { if (z == origin) {
@@ -223,9 +225,11 @@ public class Zone implements java.io.Serializable, Iterable<Card> {
} }
if (cardsAddedThisTurn.get(z).contains(card)) { if (cardsAddedThisTurn.get(z).contains(card)) {
long tsAlt = getCardsAddedThisTurn(z).get(getCardsAddedThisTurn(z).lastIndexOf(card)).getTimestamp(); List<Card> 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 // the most recent version of this card did not come from the requested zone
if (tsAlt > ts) { if (cardTimestamp > cardTimestampOrigin) {
return false; return false;
} }
} }