diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilMana.java b/forge-ai/src/main/java/forge/ai/ComputerUtilMana.java
index 8be6891d926..161e84c2dda 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtilMana.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtilMana.java
@@ -15,8 +15,10 @@ import forge.game.Game;
 import forge.game.GameActionUtil;
 import forge.game.ability.*;
 import forge.game.card.*;
+import forge.game.combat.Combat;
 import forge.game.combat.CombatUtil;
 import forge.game.cost.*;
+import forge.game.keyword.Keyword;
 import forge.game.mana.Mana;
 import forge.game.mana.ManaCostBeingPaid;
 import forge.game.mana.ManaPool;
@@ -1528,6 +1530,16 @@ public class ComputerUtilMana {
         // 3. Use lands that produce any color many
         // 4. all other sources (creature, costs, drawback, etc.)
         for (Card card : manaSources) {
+            // exclude creature sources that will tap as a part of an attack declaration
+            if (card.isCreature()) {
+                if (card.getGame().getPhaseHandler().is(PhaseType.COMBAT_DECLARE_ATTACKERS, ai)) {
+                    Combat combat = card.getGame().getCombat();
+                    if (combat.getAttackers().indexOf(card) != -1 && !card.hasKeyword(Keyword.VIGILANCE)) {
+                        continue;
+                    }
+                }
+            }
+
             if (card.isCreature() || card.isEnchanted()) {
                 otherManaSources.add(card);
                 continue; // don't use creatures before other permanents
diff --git a/forge-gui/release-files/ANNOUNCEMENTS.txt b/forge-gui/release-files/ANNOUNCEMENTS.txt
index f75b089cb4c..20d2d7a66a9 100644
--- a/forge-gui/release-files/ANNOUNCEMENTS.txt
+++ b/forge-gui/release-files/ANNOUNCEMENTS.txt
@@ -3,6 +3,7 @@ Get in the discord if you aren't yet.
 The game is now translated into Japanese (not all the messages are translated yet).
 Mutate is now fully implemented.
 The game now supports an assortment of silver-bordered cards from Unhinged, Unglued, Unstable, and other similar sets.
-There is now a new Net Deck category - the Standard archive.
+There are new Net Deck categories - the Standard, Modern, and Pioneer archives.
 Draft cubes have been updated to account for the newly supported cards, MTGO Vintage December 2020 cube was added.
 New Possibility Storm puzzles were added to the Puzzle Mode (IKO/M21/ZNR/KHM), including puzzles that utilize Mutate.
+Planar Conquest now has a new plane accessible - Eldraine.
diff --git a/forge-gui/res/cardsfolder/e/egon_god_of_death_throne_of_death.txt b/forge-gui/res/cardsfolder/e/egon_god_of_death_throne_of_death.txt
index f9afcb99def..158eefdcfef 100644
--- a/forge-gui/res/cardsfolder/e/egon_god_of_death_throne_of_death.txt
+++ b/forge-gui/res/cardsfolder/e/egon_god_of_death_throne_of_death.txt
@@ -20,6 +20,6 @@ ManaCost:B
 Types:Legendary Artifact
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ At the beginning of your upkeep, mill a card.
 SVar:TrigMill:DB$ Mill | Defined$ You | NumCards$ 1
-A:AB$ Draw | Cost$ 2 B T ExileFromGrave<1/Creature> | NumCards$ 1 | SpellDescription$ Draw a card.
+A:AB$ Draw | Cost$ 2 B T ExileFromGrave<1/Creature/creature card> | NumCards$ 1 | SpellDescription$ Draw a card.
 DeckHas:Ability$Mill
 Oracle:At the beginning of your upkeep, mill a card.\n{2}{B}, {T}, Exile a creature card from your graveyard: Draw a card.