From 96ec100b054380895d686e1b4845d663aa86a100 Mon Sep 17 00:00:00 2001
From: Susucre <34709007+Susucre@users.noreply.github.com>
Date: Sat, 4 Nov 2023 21:38:18 +0100
Subject: [PATCH] cleanup a few of the new cards.

---
 Mage.Sets/src/mage/cards/a/AnotherChance.java        |  3 +++
 Mage.Sets/src/mage/cards/b/BringerOfTheLastGift.java |  3 +++
 Mage.Sets/src/mage/cards/e/EatenByPiranhas.java      | 10 +++++-----
 Mage.Sets/src/mage/cards/w/WitnessProtection.java    |  8 +++++---
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/a/AnotherChance.java b/Mage.Sets/src/mage/cards/a/AnotherChance.java
index 6cf61cd76d8..ccc7268675a 100644
--- a/Mage.Sets/src/mage/cards/a/AnotherChance.java
+++ b/Mage.Sets/src/mage/cards/a/AnotherChance.java
@@ -69,6 +69,9 @@ class AnotherChanceEffect extends OneShotEffect {
             player.millCards(2, source, game);
         }
 
+        // Make sure the mill has been processed.
+        game.getState().processAction(game);
+
         TargetCard target = new TargetCardInYourGraveyard(
                 0, 2, StaticFilters.FILTER_CARD_CREATURES_YOUR_GRAVEYARD, true
         );
diff --git a/Mage.Sets/src/mage/cards/b/BringerOfTheLastGift.java b/Mage.Sets/src/mage/cards/b/BringerOfTheLastGift.java
index e125c3d5384..d62c8adfb9c 100644
--- a/Mage.Sets/src/mage/cards/b/BringerOfTheLastGift.java
+++ b/Mage.Sets/src/mage/cards/b/BringerOfTheLastGift.java
@@ -94,6 +94,9 @@ class BringerOfTheLastGiftEffect extends OneShotEffect {
             notReturned.add(p.getMainCard().getId());
         }
 
+        // Make sure the sacrifices are processed.
+        game.getState().processAction(game);
+
         Set<Card> toReturn = new HashSet<>();
         for (UUID playerId : game.getState().getPlayersInRange(source.getControllerId(), game)) {
             Player player = game.getPlayer(playerId);
diff --git a/Mage.Sets/src/mage/cards/e/EatenByPiranhas.java b/Mage.Sets/src/mage/cards/e/EatenByPiranhas.java
index 9881494a04d..ff8ed0a9053 100644
--- a/Mage.Sets/src/mage/cards/e/EatenByPiranhas.java
+++ b/Mage.Sets/src/mage/cards/e/EatenByPiranhas.java
@@ -55,8 +55,6 @@ public final class EatenByPiranhas extends CardImpl {
  */
 class EatenByPiranhasEffect extends ContinuousEffectImpl {
 
-    private static final ObjectColor color = new ObjectColor("B");
-
     EatenByPiranhasEffect() {
         super(Duration.WhileOnBattlefield, Outcome.Benefit);
         staticText = "enchanted creature loses all abilities and is a black Skeleton creature " +
@@ -88,17 +86,19 @@ class EatenByPiranhasEffect extends ContinuousEffectImpl {
                 permanent.addCardType(game, CardType.CREATURE);
                 permanent.removeAllSubTypes(game);
                 permanent.addSubType(game, SubType.SKELETON);
-                return true;
+                break;
             case ColorChangingEffects_5:
-                permanent.getColor(game).setColor(color);
+                permanent.getColor(game).setColor(ObjectColor.BLACK);
+                break;
             case AbilityAddingRemovingEffects_6:
                 permanent.removeAllAbilities(source.getSourceId(), game);
-                return true;
+                break;
             case PTChangingEffects_7:
                 if (sublayer == SubLayer.SetPT_7b) {
                     permanent.getPower().setModifiedBaseValue(1);
                     permanent.getToughness().setModifiedBaseValue(1);
                 }
+                break;
         }
         return true;
     }
diff --git a/Mage.Sets/src/mage/cards/w/WitnessProtection.java b/Mage.Sets/src/mage/cards/w/WitnessProtection.java
index b47714d9c83..8b3db5b2e3d 100644
--- a/Mage.Sets/src/mage/cards/w/WitnessProtection.java
+++ b/Mage.Sets/src/mage/cards/w/WitnessProtection.java
@@ -78,23 +78,25 @@ class WitnessProtectionEffect extends ContinuousEffectImpl {
         switch (layer) {
             case TextChangingEffects_3:
                 permanent.setName("Legitimate Businessperson");
-                return true;
+                break;
             case TypeChangingEffects_4:
                 permanent.removeAllCardTypes(game);
                 permanent.addCardType(game, CardType.CREATURE);
                 permanent.removeAllSubTypes(game);
                 permanent.addSubType(game, SubType.CITIZEN);
-                return true;
+                break;
             case ColorChangingEffects_5:
                 permanent.getColor(game).setColor(color);
+                break;
             case AbilityAddingRemovingEffects_6:
                 permanent.removeAllAbilities(source.getSourceId(), game);
-                return true;
+                break;
             case PTChangingEffects_7:
                 if (sublayer == SubLayer.SetPT_7b) {
                     permanent.getPower().setModifiedBaseValue(1);
                     permanent.getToughness().setModifiedBaseValue(1);
                 }
+                break;
         }
         return true;
     }