From 04659d111b8c0300e30ae676c3de6ab1d34f3244 Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Wed, 29 Oct 2014 13:51:26 +0000
Subject: [PATCH] - Better fix for granted abilities (more in line with drdevs
 changes). - Also Fixed Border color of detail panel.

---
 forge-game/src/main/java/forge/game/GameAction.java         | 3 ---
 forge-game/src/main/java/forge/game/card/Card.java          | 5 +++++
 forge-game/src/main/java/forge/game/phase/PhaseHandler.java | 3 ---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java
index b43220b9725..a7797d2008e 100644
--- a/forge-game/src/main/java/forge/game/GameAction.java
+++ b/forge-game/src/main/java/forge/game/GameAction.java
@@ -766,9 +766,6 @@ public class GameAction {
         TrackableObject.unfreeze();
 
         if (runEvents && !affectedCards.isEmpty()) {
-        	for (Card c : affectedCards) {
-        		c.updateKeywords();
-        	}
             game.fireEvent(new GameEventCardStatsChanged(affectedCards));
         }
 
diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
index 92b50aba063..bed880fd6e0 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -1034,6 +1034,7 @@ public class Card extends GameEntity implements Comparable<Card>, IIdentifiable
             CardColor.increaseTimestamp();
         }
         currentState.getCardColor().add(new CardColor(s, addToColors));
+        currentState.getView().updateColors(this);
         return CardColor.getTimestamp();
     }
 
@@ -1047,11 +1048,13 @@ public class Card extends GameEntity implements Comparable<Card>, IIdentifiable
 
         if (removeCol != null) {
             currentState.getCardColor().remove(removeCol);
+            currentState.getView().updateColors(this);
         }
     }
 
     public final void setColor(final Iterable<CardColor> colors) {
         currentState.setCardColor(colors);
+        currentState.getView().updateColors(this);
     }
 
     public final Iterable<CardColor> getColor() {
@@ -1867,10 +1870,12 @@ public class Card extends GameEntity implements Comparable<Card>, IIdentifiable
     public final void addSpellAbility(final SpellAbility a) {
         a.setHostCard(this);
         currentState.addSpellAbility(a);
+        currentState.getView().updateAbilityText(this, currentState);
     }
 
     public final void removeSpellAbility(final SpellAbility a) {
         currentState.removeSpellAbility(a);
+        currentState.getView().updateAbilityText(this, currentState);
     }
 
     public final FCollectionView<SpellAbility> getSpellAbilities() {
diff --git a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
index d49f1763054..6bd708ad002 100644
--- a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
+++ b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
@@ -873,9 +873,6 @@ public class PhaseHandler implements java.io.Serializable {
                     } while (game.getStack().addAllTriggeredAbilitiesToStack()); //loop so long as something was added to stack
 
                     if (!allAffectedCards.isEmpty()) {
-                    	for (Card c : allAffectedCards) {
-                    		c.updateKeywords();
-                    	}
                         game.fireEvent(new GameEventCardStatsChanged(allAffectedCards));
                         allAffectedCards.clear();
                     }