From c2e4b8fab0b32ab6eb4629d5bed4f8efdadc5c61 Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Sun, 1 Aug 2021 09:09:35 +0200
Subject: [PATCH] Fully clean Blessing & Monarch

---
 .../forge/game/ability/effects/RestartGameEffect.java  |  3 ++-
 forge-game/src/main/java/forge/game/player/Player.java | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java
index 7d81128d7bc..53ce96f4059 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java
@@ -49,6 +49,7 @@ public class RestartGameEffect extends SpellAbilityEffect {
         game.clearCounterAddedThisTurn();
         game.resetPlayersAttackedOnNextTurn();
         game.resetPlayersAttackedOnNextTurn();
+        game.setMonarch(null);
         GameAction action = game.getAction();
 
         for (Player p: players) {
@@ -59,6 +60,7 @@ public class RestartGameEffect extends SpellAbilityEffect {
             p.setLandsPlayedLastTurn(0);
             p.resetCommanderStats();
             p.resetCompletedDungeons();
+            p.setBlessing(false);
 
             CardCollection newLibrary = new CardCollection(p.getCardsIn(restartZones, false));
             List<Card> filteredCards = null;
@@ -111,4 +113,3 @@ public class RestartGameEffect extends SpellAbilityEffect {
         return TextUtil.fastReplace(desc, "CARDNAME", sa.getHostCard().getName());
     }
 }
-
diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java
index a59de27a130..3667af7abc5 100644
--- a/forge-game/src/main/java/forge/game/player/Player.java
+++ b/forge-game/src/main/java/forge/game/player/Player.java
@@ -3221,21 +3221,21 @@ public class Player extends GameEntity implements Comparable<Player> {
     }
 
     public void updateKeywordCardAbilityText() {
-        if(getKeywordCard() == null)
+        if (getKeywordCard() == null)
             return;
         final PlayerZone com = getZone(ZoneType.Command);
         keywordEffect.setText("");
         keywordEffect.updateAbilityTextForView();
         boolean headerAdded = false;
         StringBuilder kw = new StringBuilder();
-        for(KeywordInterface k : keywords) {
-            if(!headerAdded) {
+        for (KeywordInterface k : keywords) {
+            if (!headerAdded) {
                 headerAdded = true;
                 kw.append(this.getName()).append(" has: \n");
             }
             kw.append(k).append("\n");
         }
-        if(!kw.toString().isEmpty()) {
+        if (!kw.toString().isEmpty()) {
             keywordEffect.setText(trimKeywords(kw.toString()));
             keywordEffect.updateAbilityTextForView();
         }
@@ -3275,7 +3275,7 @@ public class Player extends GameEntity implements Comparable<Player> {
 
         final PlayerZone com = getZone(ZoneType.Command);
 
-        if(bless) {
+        if (bless) {
             blessingEffect = new Card(game.nextCardId(), null, game);
             blessingEffect.setOwner(this);
             blessingEffect.setImageKey("t:blessing");