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

Merge branch 'fix-damagereceivedcond' into 'master'

Browse Source 
Fixed an issue which caused DamageReceivedCondition not to work and always return 0.

See merge request core-developers/forge!1219
This commit is contained in:
Michael Kamensky
2018-12-13 19:04:02 +00:00
parent f6bd4ca951 ee960c9c08
commit a9e3a2d927
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java
View File

@@ -160,7 +160,10 @@ public class TriggerChangesZone extends Trigger {
return false;
}
final boolean expr = Expressions.compare(card.getTotalDamageRecievedThisTurn(), cond, rightSide);
// need to check the ChangeZone LKI copy for damage, otherwise it'll return 0 for a new object in the new zone
Card lkiCard = card.getGame().getChangeZoneLKIInfo(card);
final boolean expr = Expressions.compare(lkiCard.getTotalDamageRecievedThisTurn(), cond, rightSide);
if (!expr) {
return false;
}