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

Merge branch 'fixdroid' into 'master'

Browse Source 
hotfix for Android

See merge request core-developers/forge!4830
This commit is contained in:
Tim Mocny
2021-06-05 11:02:46 +00:00
parent 3047e40116 24c45c7cc2
commit f73fac0eb4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-mobile/src/forge/screens/match/views/VAssignCombatDamage.java
View File

@@ -461,8 +461,8 @@ public class VAssignCombatDamage extends FDialog {
} }
else { else {
lethalDamage = Math.max(0, source.getLethalDamage()); lethalDamage = Math.max(0, source.getLethalDamage());
if (card.getCurrentState().getType().isPlaneswalker()) { if (source.getCurrentState().getType().isPlaneswalker()) {
lethalDamage = Integer.valueOf(card.getCurrentState().getLoyalty()); lethalDamage = Integer.valueOf(source.getCurrentState().getLoyalty());
} else if (attackerHasDeathtouch) { } else if (attackerHasDeathtouch) {
lethalDamage = Math.min(lethalDamage, 1); lethalDamage = Math.min(lethalDamage, 1);
} }