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

- Fixed possible NPE in combatTriggerWillTrigger.

Browse Source
This commit is contained in:
Sloth
2013-06-26 13:44:11 +00:00
parent 6e111aab3a
commit f280ba4e05
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/forge/game/ai/ComputerUtilCombat.java
View File

@@ -586,6 +586,9 @@ public class ComputerUtilCombat {
final Card source = trigger.getHostCard(); final Card source = trigger.getHostCard();
if (combat == null) { if (combat == null) {
combat = game.getCombat(); combat = game.getCombat();
if (combat == null) {
return false;
}
} }
if (!trigger.zonesCheck(game.getZoneOf(trigger.getHostCard()))) { if (!trigger.zonesCheck(game.getZoneOf(trigger.getHostCard()))) {