From 46d61a1ebc82f0564bb3c72a0b84fd1db3a64938 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 21 Jun 2018 22:49:15 +0200 Subject: [PATCH] Fixed some possible exceptions. --- Mage.Sets/src/mage/cards/c/ComboAttack.java | 2 +- Mage.Sets/src/mage/cards/s/SelflessSquire.java | 5 ++--- Mage.Sets/src/mage/cards/t/TreetopBracers.java | 10 ++++------ .../java/mage/target/common/TargetAnyTargetAmount.java | 5 +++-- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Mage.Sets/src/mage/cards/c/ComboAttack.java b/Mage.Sets/src/mage/cards/c/ComboAttack.java index 9a523b567d3..538197b83dc 100644 --- a/Mage.Sets/src/mage/cards/c/ComboAttack.java +++ b/Mage.Sets/src/mage/cards/c/ComboAttack.java @@ -55,7 +55,7 @@ class ComboAttackEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - if (source.getTargets().size() < 2) { + if (source.getTargets().size() < 2 || source.getTargets().get(0).getTargets().size() < 2) { return false; } Permanent permanent1 = game.getPermanent(source.getTargets().get(0).getTargets().get(0)); diff --git a/Mage.Sets/src/mage/cards/s/SelflessSquire.java b/Mage.Sets/src/mage/cards/s/SelflessSquire.java index a77aa097ecb..adcd11469e6 100644 --- a/Mage.Sets/src/mage/cards/s/SelflessSquire.java +++ b/Mage.Sets/src/mage/cards/s/SelflessSquire.java @@ -1,4 +1,3 @@ - package mage.cards.s; import java.util.UUID; @@ -11,8 +10,8 @@ import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; @@ -75,7 +74,7 @@ class SelflessSquireTriggeredAbility extends TriggeredAbilityImpl { @Override public boolean checkTrigger(GameEvent event, Game game) { - if (event.getTargetId().equals(getControllerId())) { + if (getControllerId().equals(event.getTargetId())) { getEffects().clear(); getEffects().add(new AddCountersSourceEffect(CounterType.P1P1.createInstance(event.getAmount()))); return true; diff --git a/Mage.Sets/src/mage/cards/t/TreetopBracers.java b/Mage.Sets/src/mage/cards/t/TreetopBracers.java index 59f99ca20ac..a1bcb1f2422 100644 --- a/Mage.Sets/src/mage/cards/t/TreetopBracers.java +++ b/Mage.Sets/src/mage/cards/t/TreetopBracers.java @@ -1,4 +1,3 @@ - package mage.cards.t; import java.util.UUID; @@ -21,12 +20,12 @@ import mage.target.common.TargetCreaturePermanent; /** * * @author Jason E. Wall - + * */ public final class TreetopBracers extends CardImpl { public TreetopBracers(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); this.subtype.add(SubType.AURA); // Enchant creature @@ -37,7 +36,7 @@ public final class TreetopBracers extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1 and can't be blocked except by creatures with flying. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1,1, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)); ability.addEffect(new TreetopBracersRestrictEffect()); this.addAbility(ability); } @@ -52,7 +51,6 @@ public final class TreetopBracers extends CardImpl { } } - class TreetopBracersRestrictEffect extends RestrictionEffect { public TreetopBracersRestrictEffect() { @@ -69,7 +67,7 @@ class TreetopBracersRestrictEffect extends RestrictionEffect { Permanent equipment = game.getPermanent(source.getSourceId()); if (equipment != null && equipment.getAttachedTo() != null) { Permanent equipped = game.getPermanent(equipment.getAttachedTo()); - if (permanent.getId().equals(equipped.getId())) { + if (permanent != null && permanent.getId().equals(equipped.getId())) { return true; } } diff --git a/Mage/src/main/java/mage/target/common/TargetAnyTargetAmount.java b/Mage/src/main/java/mage/target/common/TargetAnyTargetAmount.java index c566675203e..37c8d4f8fb4 100644 --- a/Mage/src/main/java/mage/target/common/TargetAnyTargetAmount.java +++ b/Mage/src/main/java/mage/target/common/TargetAnyTargetAmount.java @@ -1,4 +1,3 @@ - package mage.target.common; import java.util.HashSet; @@ -178,7 +177,9 @@ public class TargetAnyTargetAmount extends TargetAmount { sb.append(permanent.getLogName()).append('(').append(getTargetAmount(targetId)).append(") "); } else { Player player = game.getPlayer(targetId); - sb.append(player.getLogName()).append('(').append(getTargetAmount(targetId)).append(") "); + if (player != null) { + sb.append(player.getLogName()).append('(').append(getTargetAmount(targetId)).append(") "); + } } } return sb.toString();