From bb9fac0f2df2ce1ac14d4201ea24a463e98187cd Mon Sep 17 00:00:00 2001
From: elcnesh <elcnesh@cardforge.org>
Date: Sat, 30 Aug 2014 22:53:45 +0000
Subject: [PATCH] Fix possible error with merging keyword changes.

---
 forge-game/src/main/java/forge/game/player/Player.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 7b81ac22e40..aca4b22ff1d 100644
--- a/forge-game/src/main/java/forge/game/player/Player.java
+++ b/forge-game/src/main/java/forge/game/player/Player.java
@@ -1148,9 +1148,9 @@ public class Player extends GameEntity implements Comparable<Player> {
     public final void addChangedKeywords(final List<String> addKeywords, final List<String> removeKeywords, final Long timestamp) {
         // if the key already exists - merge entries
         if (changedKeywords.containsKey(timestamp)) {
-            List<String> kws = addKeywords;
-            List<String> rkws = removeKeywords;
-            KeywordsChange cks = changedKeywords.get(timestamp);
+            final List<String> kws = addKeywords == null ? Lists.<String>newArrayList() : Lists.newArrayList(addKeywords);
+            final List<String> rkws = removeKeywords == null ? Lists.<String>newArrayList() : Lists.newArrayList(removeKeywords);
+            final KeywordsChange cks = changedKeywords.get(timestamp);
             kws.addAll(cks.getKeywords());
             rkws.addAll(cks.getRemoveKeywords());
             this.changedKeywords.put(timestamp, new KeywordsChange(kws, rkws, cks.isRemoveAllKeywords()));