From fed7c2b288675187ef5dd12816187f997b04e277 Mon Sep 17 00:00:00 2001 From: Ingmar Goudt Date: Sun, 22 Aug 2021 12:20:28 +0200 Subject: [PATCH] small Sonar fixes --- Mage.Sets/src/mage/cards/p/PolukranosUnchained.java | 3 +-- Mage.Sets/src/mage/cards/t/ThranTome.java | 2 +- Mage.Sets/src/mage/cards/t/TizerusCharger.java | 3 +-- .../main/java/mage/abilities/common/EscapesWithAbility.java | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Mage.Sets/src/mage/cards/p/PolukranosUnchained.java b/Mage.Sets/src/mage/cards/p/PolukranosUnchained.java index 083f3092f38..5831803e518 100644 --- a/Mage.Sets/src/mage/cards/p/PolukranosUnchained.java +++ b/Mage.Sets/src/mage/cards/p/PolukranosUnchained.java @@ -96,8 +96,7 @@ class PolukranosUnchainedEffect extends OneShotEffect { int counters = 12; if (!(spellAbility instanceof EscapeAbility) || !spellAbility.getSourceId().equals(source.getSourceId()) - || permanent.getZoneChangeCounter(game) != spellAbility.getSourceObjectZoneChangeCounter() - || !spellAbility.getSourceId().equals(source.getSourceId())) { + || permanent.getZoneChangeCounter(game) != spellAbility.getSourceObjectZoneChangeCounter()) { counters = 6; } List appliedEffects = (ArrayList) this.getValue("appliedEffects"); diff --git a/Mage.Sets/src/mage/cards/t/ThranTome.java b/Mage.Sets/src/mage/cards/t/ThranTome.java index 14bfafad933..43304db5bed 100644 --- a/Mage.Sets/src/mage/cards/t/ThranTome.java +++ b/Mage.Sets/src/mage/cards/t/ThranTome.java @@ -66,7 +66,7 @@ class ThranTomeEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); MageObject sourceObject = game.getObject(source.getSourceId()); - if (sourceObject == null && controller == null) { + if (sourceObject == null || controller == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/t/TizerusCharger.java b/Mage.Sets/src/mage/cards/t/TizerusCharger.java index 8b863cdebdb..729d2e28491 100644 --- a/Mage.Sets/src/mage/cards/t/TizerusCharger.java +++ b/Mage.Sets/src/mage/cards/t/TizerusCharger.java @@ -82,8 +82,7 @@ class TizerusChargerEffect extends OneShotEffect { SpellAbility spellAbility = (SpellAbility) getValue(EntersBattlefieldEffect.SOURCE_CAST_SPELL_ABILITY); if (!(spellAbility instanceof EscapeAbility) || !spellAbility.getSourceId().equals(source.getSourceId()) - || permanent.getZoneChangeCounter(game) != spellAbility.getSourceObjectZoneChangeCounter() - || !spellAbility.getSourceId().equals(source.getSourceId())) { + || permanent.getZoneChangeCounter(game) != spellAbility.getSourceObjectZoneChangeCounter()) { return false; } List appliedEffects = (ArrayList) this.getValue("appliedEffects"); diff --git a/Mage/src/main/java/mage/abilities/common/EscapesWithAbility.java b/Mage/src/main/java/mage/abilities/common/EscapesWithAbility.java index 3c7dc338dea..1c4e0b751f6 100644 --- a/Mage/src/main/java/mage/abilities/common/EscapesWithAbility.java +++ b/Mage/src/main/java/mage/abilities/common/EscapesWithAbility.java @@ -83,8 +83,7 @@ class EscapesWithEffect extends OneShotEffect { SpellAbility spellAbility = (SpellAbility) getValue(EntersBattlefieldEffect.SOURCE_CAST_SPELL_ABILITY); if (!(spellAbility instanceof EscapeAbility) || !spellAbility.getSourceId().equals(source.getSourceId()) - || permanent.getZoneChangeCounter(game) != spellAbility.getSourceObjectZoneChangeCounter() - || !spellAbility.getSourceId().equals(source.getSourceId())) { + || permanent.getZoneChangeCounter(game) != spellAbility.getSourceObjectZoneChangeCounter()) { return false; } List appliedEffects = (ArrayList) this.getValue("appliedEffects");