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

- Fixed ThisTurnEntered and LastTurnEnded so controller change effects will not count

Browse Source
This commit is contained in:
swordshine
2014-02-11 04:41:38 +00:00
parent 875d019b1c
commit f862a01a78
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -1199,6 +1199,10 @@ public class CardFactoryUtil {
String validFilter = workingCopy[hasFrom ? 4 : 2] ;
final List<Card> res = CardUtil.getThisTurnEntered(destination, origin, validFilter, c);
if (origin == null) { // Remove cards on the battlefield that changed controller
List<Card> sameDest = CardUtil.getThisTurnEntered(destination, destination, validFilter, c);
res.removeAll(sameDest);
}
return doXMath(res.size(), m, c);
}
@@ -1212,6 +1216,10 @@ public class CardFactoryUtil {
String validFilter = workingCopy[hasFrom ? 4 : 2] ;
final List<Card> res = CardUtil.getLastTurnEntered(destination, origin, validFilter, c);
if (origin == null) { // Remove cards on the battlefield that changed controller
List<Card> sameDest = CardUtil.getLastTurnEntered(destination, destination, validFilter, c);
res.removeAll(sameDest);
}
return doXMath(res.size(), m, c);
}