Merge branch 'gauntletfix' into 'master'

Fix some more NPE related to gauntlets

See merge request core-developers/forge!5583

forge-ai/src/main/java/forge/ai/ComputerUtil.java

@@ -1910,11 +1910,7 @@ public class ComputerUtil {
      * @return true if the creature dies according to current board position.
      */
     public static boolean predictCreatureWillDieThisTurn(final Player ai, final Card creature, final SpellAbility excludeSa) {
-        final Game game = creature.getGame();
+        final Game game = ai.getGame();
-
-        // a creature will die as a result of combat
-        boolean willDieInCombat = game.getPhaseHandler().inCombat()
-                && ComputerUtilCombat.combatantWouldBeDestroyed(creature.getController(), creature, game.getCombat());
 
         // a creature will [hopefully] die from a spell on stack
         boolean willDieFromSpell = false;
@@ -1933,6 +1929,10 @@ public class ComputerUtil {
         }
         willDieFromSpell = !noStackCheck && predictThreatenedObjects(creature.getController(), excludeSa).contains(creature);
 
+        // a creature will die as a result of combat
+        boolean willDieInCombat = !willDieFromSpell && game.getPhaseHandler().inCombat()
+                && ComputerUtilCombat.combatantWouldBeDestroyed(creature.getController(), creature, game.getCombat());
+
         return willDieInCombat || willDieFromSpell;
     }
 

forge-ai/src/main/java/forge/ai/ComputerUtilCard.java

@@ -750,7 +750,6 @@ public class ComputerUtilCard {
     
         for (final Entry<String, Integer> entry : map.entrySet()) {
             final String type = entry.getKey();
-            // Log.debug(type + " - " + entry.getValue());
     
             if (max < entry.getValue()) {
                 max = entry.getValue();
@@ -784,7 +783,6 @@ public class ComputerUtilCard {
 
         // TODO JAVA 8 use getOrDefault
         for (final Card c : list) {
-
             // Changeling are all creature types, they are not interesting for
             // counting creature types
             if (c.hasStartOfKeyword(Keyword.CHANGELING.toString())) {

forge-ai/src/main/java/forge/ai/ability/GoadAi.java

@@ -19,7 +19,6 @@ public class GoadAi extends SpellAbilityAi {
 
     @Override
     protected boolean checkApiLogic(final Player ai, final SpellAbility sa) {
-
         final Card source = sa.getHostCard();
         final Game game = source.getGame();
 

forge-ai/src/main/java/forge/ai/ability/MustAttackAi.java

@@ -25,7 +25,6 @@ public class MustAttackAi extends SpellAbilityAi {
      */
     @Override
     protected boolean doTriggerAINoCost(Player aiPlayer, SpellAbility sa, boolean mandatory) {
-
         boolean chance;
 
         // TODO - implement AI

forge-ai/src/main/java/forge/ai/ability/MustBlockAi.java

@@ -160,7 +160,6 @@ public class MustBlockAi extends SpellAbilityAi {
 
     private List<Card> determineGoodBlockers(final Card attacker, final Player ai, Player defender, SpellAbility sa,
             final boolean onlyLethal, final boolean testTapped) {
-
         List<Card> list = Lists.newArrayList();
         list = CardLists.filter(defender.getCardsIn(ZoneType.Battlefield), CardPredicates.Presets.CREATURES);
 

forge-ai/src/main/java/forge/ai/ability/PermanentNoncreatureAi.java

@@ -42,8 +42,7 @@ public class PermanentNoncreatureAi extends PermanentAi {
             CardCollection targets = CardLists.getTargetableCards(game.getCardsIn(origin), effectExile);
             if (sourceName.equals("Suspension Field") 
                     || sourceName.equals("Detention Sphere")) {
-                // existing "exile until leaves" enchantments only target
+                // existing "exile until leaves" enchantments only target opponent's permanents
-                // opponent's permanents
                 // TODO: consider replacing the condition with host.hasSVar("OblivionRing")
                 targets = CardLists.filterControlledBy(targets, ai.getOpponents());
             }

forge-ai/src/main/java/forge/ai/ability/RestartGameAi.java

@@ -38,9 +38,4 @@ public class RestartGameAi extends SpellAbilityAi {
         return false;
     }
 
-    @Override
-    protected boolean doTriggerAINoCost(Player aiPlayer, SpellAbility sa, boolean mandatory) {
-        // This trigger AI is completely unused, but return true just in case
-        return true;
-    }
 }

forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java

@@ -197,13 +197,7 @@ public class DamageDealEffect extends DamageBaseEffect {
                     return;
                 }
 
-                CardCollection assigneeCards = new CardCollection();
+                CardCollection assigneeCards = new CardCollection(Iterables.filter(tgts, Card.class));
-                // Do we have a way of doing this in a better fashion?
-                for (GameObject obj : tgts) {
-                    if (obj instanceof Card) {
-                        assigneeCards.add((Card) obj);
-                    }
-                }
 
                 Player assigningPlayer = players.get(0);
                 Map<Card, Integer> map = assigningPlayer.getController().assignCombatDamage(sourceLKI, assigneeCards, dmg, null, true);

forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletBuild.java

@@ -122,8 +122,8 @@ public enum CSubmenuGauntletBuild implements ICDoc {
     }
 
     private void addDeck() {
-        final Deck deckToAdd = view.getLstLeft().getPlayer().getDeck();
+        final Deck deckToAdd = view.getLstLeft().getPlayer() != null ? view.getLstLeft().getPlayer().getDeck() : null;
-        if ( null == deckToAdd ) {
+        if (null == deckToAdd) {
             return;
         }
         workingDecks.add(deckToAdd);
@@ -145,7 +145,7 @@ public enum CSubmenuGauntletBuild implements ICDoc {
     private void deckUp() {
         final int oldIndex = view.getLstRight().getSelectedIndex();
 
-        if (oldIndex == 0) { return; }
+        if (oldIndex <= 0) { return; }
 
         final Deck movingDeck = workingDecks.remove(oldIndex);
         workingDecks.add(oldIndex - 1, movingDeck);

forge-gui/res/cardsfolder/b/bounding_wolf.txt

@@ -1,6 +1,6 @@
 Name:Bounding Wolf
 ManaCost:2 G
-Types:Creature wolf
+Types:Creature Wolf
 PT:3/2
 K:Flash
 K:Reach

forge-gui/res/cardsfolder/m/master_of_the_wild_hunt.txt

@@ -8,7 +8,8 @@ A:AB$ DealDamage | Cost$ T | SubAbility$ TapWolves | ValidTgts$ Creature | NumDm
 SVar:TapWolves:DB$ TapAll | ValidCards$ Creature.Wolf+YouCtrl+untapped | RememberTapped$ True | SubAbility$ WildHuntDamage | StackDescription$ None
 SVar:WildHuntDamage:DB$ RepeatEach | RepeatSubAbility$ WolfStrike | UseImprinted$ True | RepeatCards$ Card.IsRemembered | DamageMap$ True | SubAbility$ HuntedDamage | StackDescription$ None
 SVar:WolfStrike:DB$ DealDamage | DamageSource$ Imprinted | NumDmg$ X | Defined$ ParentTarget | StackDescription$ None
-SVar:HuntedDamage:DB$ DealDamage | DamageSource$ ParentTarget | NumDmg$ Y | DividerOnResolution$ ParentTargetedController | Defined$ Remembered | StackDescription$ None
+SVar:HuntedDamage:DB$ DealDamage | DamageSource$ ParentTarget | NumDmg$ Y | DividerOnResolution$ ParentTargetedController | Defined$ Remembered | SubAbility$ DBDamageResolve | StackDescription$ None
+SVar:DBDamageResolve:DB$ DamageResolve
 SVar:X:Imprinted$CardPower
 SVar:Y:Targeted$CardPower
 SVar:Picture:http://www.wizards.com/global/images/magic/general/master_of_the_wild_hunt.jpg

forge-gui/src/main/java/forge/deck/DeckgenUtil.java

@@ -425,6 +425,8 @@ public class DeckgenUtil {
     /** @return {@link forge.deck.Deck} */
     public static Deck getRandomCustomDeck() {
         final IStorage<Deck> allDecks = FModel.getDecks().getConstructed();
+        // in case user has not created any yet
+        if (allDecks.size() == 0) { return null; }
         final int rand = (int) (Math.floor(MyRandom.getRandom().nextDouble() * allDecks.size()));
         final String name = allDecks.getItemNames().toArray(new String[0])[rand];
         return allDecks.get(name);

forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletUtil.java

@@ -59,8 +59,10 @@ public class GauntletUtil {
                 break;
             case CUSTOM_DECK:
                 deck = DeckgenUtil.getRandomCustomDeck();
+                if (deck != null) { // fall back to precon if none available
                     eventNames.add(deck.getName());
                     break;
+                }
             case PRECONSTRUCTED_DECK:
                 deck = DeckgenUtil.getRandomPreconDeck();
                 eventNames.add(deck.getName());

forge-gui/src/main/java/forge/gamemodes/tournament/TournamentUtil.java

@@ -56,8 +56,10 @@ public class TournamentUtil {
                     break;
                 case CUSTOM_DECK:
                     deck = DeckgenUtil.getRandomCustomDeck();
+                    if (deck != null) { // fall back to precon if none available
                         eventNames.add(deck.getName());
                         break;
+                    }
                 case PRECONSTRUCTED_DECK:
                     deck = DeckgenUtil.getRandomPreconDeck();
                     eventNames.add(deck.getName());