From 087e36b63d9c87b481c3d6447552092520fc0be9 Mon Sep 17 00:00:00 2001
From: xenohedron <xenohedron@users.noreply.github.com>
Date: Sun, 23 Jul 2023 15:29:06 -0400
Subject: [PATCH] rework Psionic Blast

---
 Mage.Sets/src/mage/cards/p/PsionicBlast.java | 35 ++------------------
 1 file changed, 2 insertions(+), 33 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/p/PsionicBlast.java b/Mage.Sets/src/mage/cards/p/PsionicBlast.java
index 8398633f10f..254ff05fe3d 100644
--- a/Mage.Sets/src/mage/cards/p/PsionicBlast.java
+++ b/Mage.Sets/src/mage/cards/p/PsionicBlast.java
@@ -1,14 +1,10 @@
 package mage.cards.p;
 
-import mage.abilities.Ability;
-import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.DamageControllerEffect;
 import mage.abilities.effects.common.DamageTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.Outcome;
-import mage.game.Game;
-import mage.players.Player;
 import mage.target.common.TargetAnyTarget;
 
 import java.util.UUID;
@@ -21,10 +17,9 @@ public final class PsionicBlast extends CardImpl {
     public PsionicBlast(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{U}");
 
-
         // Psionic Blast deals 4 damage to any target and 2 damage to you.
         this.getSpellAbility().addEffect(new DamageTargetEffect(4));
-        this.getSpellAbility().addEffect(new PsionicBlastEffect());
+        this.getSpellAbility().addEffect(new DamageControllerEffect(2).setText("and 2 damage to you"));
         this.getSpellAbility().addTarget(new TargetAnyTarget());
     }
 
@@ -37,29 +32,3 @@ public final class PsionicBlast extends CardImpl {
         return new PsionicBlast(this);
     }
 }
-
-class PsionicBlastEffect extends OneShotEffect {
-    PsionicBlastEffect() {
-        super(Outcome.Damage);
-        staticText = "{this} deals 2 damage to you";
-    }
-
-    PsionicBlastEffect(final PsionicBlastEffect effect) {
-        super(effect);
-    }
-
-    @Override
-    public boolean apply(Game game, Ability source) {
-        Player player = game.getPlayer(source.getControllerId());
-        if (player != null) {
-            player.damage(2, source.getSourceId(), source, game);
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public PsionicBlastEffect copy() {
-        return new PsionicBlastEffect(this);
-    }
-}
\ No newline at end of file