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

Fix crash when assigning damage to defender

Browse Source
This commit is contained in:
TRT
2022-01-12 13:57:50 +01:00
parent e3593ad8ac
commit 94f54f8e71
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-ai/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java
View File

@@ -171,7 +171,7 @@ public class ChooseGenericEffectAi extends SpellAbilityAi {
loyalty = sp; loyalty = sp;
} }
} }
if (sa.getParent().getTargetCard() != null && sa.getParent().getTargetCard().getType().isPlaneswalker()) { if (sa.getParent().getTargetCard() != null && sa.getParent().getTargetCard().isPlaneswalker()) {
return loyalty; return loyalty;
} else { } else {
return p1p1; return p1p1;

4
forge-gui-desktop/src/main/java/forge/screens/match/VAssignCombatDamage.java
View File

@@ -123,6 +123,8 @@ public class VAssignCombatDamage {
if (panel instanceof CardPanel) { if (panel instanceof CardPanel) {
source = ((CardPanel)panel).getCard(); source = ((CardPanel)panel).getCard();
} }
if (!damage.containsKey(source))
source = null;
final FSkin.Colors brdrColor = VAssignCombatDamage.this.canAssignTo(source) ? FSkin.Colors.CLR_ACTIVE : FSkin.Colors.CLR_INACTIVE; final FSkin.Colors brdrColor = VAssignCombatDamage.this.canAssignTo(source) ? FSkin.Colors.CLR_ACTIVE : FSkin.Colors.CLR_INACTIVE;
panel.setBorder(new FSkin.LineSkinBorder(FSkin.getColor(brdrColor), 2)); panel.setBorder(new FSkin.LineSkinBorder(FSkin.getColor(brdrColor), 2));
@@ -453,7 +455,7 @@ public class VAssignCombatDamage {
} }
} else { } else {
lethalDamage = Math.max(0, card.getLethalDamage()); lethalDamage = Math.max(0, card.getLethalDamage());
if (card.getCurrentState().getType().isPlaneswalker()) { if (card.getCurrentState().isPlaneswalker()) {
lethalDamage = Integer.valueOf(card.getCurrentState().getLoyalty()); lethalDamage = Integer.valueOf(card.getCurrentState().getLoyalty());
} else if (attackerHasDeathtouch) { } else if (attackerHasDeathtouch) {
lethalDamage = Math.min(lethalDamage, 1); lethalDamage = Math.min(lethalDamage, 1);