From b20b572f6046054e17d6a312313fa362b66aa304 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Sun, 5 Dec 2010 14:08:55 +0000
Subject: [PATCH] Fixed Deck generator that put very high rated cards even if
 they didn't fit the selected colors. Fixed bug in grouping attachments.

---
 .../src/main/java/mage/client/deck/generator/DeckGenerator.java | 2 +-
 .../src/main/java/mage/client/game/BattlefieldPanel.java        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Mage.Client/src/main/java/mage/client/deck/generator/DeckGenerator.java b/Mage.Client/src/main/java/mage/client/deck/generator/DeckGenerator.java
index 410f84b0e17..6996d6706b8 100644
--- a/Mage.Client/src/main/java/mage/client/deck/generator/DeckGenerator.java
+++ b/Mage.Client/src/main/java/mage/client/deck/generator/DeckGenerator.java
@@ -346,7 +346,7 @@ public class DeckGenerator {
 						}
 					}
 					if (count == 0) {
-						return 0;
+						return -10;
 					}
 					Integer typeCount = singleCount.get(symbol);
 					if (typeCount == null) {
diff --git a/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java b/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java
index 62f882a7a99..94dacb47935 100644
--- a/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java
@@ -146,6 +146,7 @@ public class BattlefieldPanel extends javax.swing.JLayeredPane implements Compon
 	
 	private void groupAttachments(PermanentView permanent) {
 		MagePermanent perm = permanents.get(permanent.getId());
+		if (perm == null) return;
 		int position = getPosition(perm);
 		perm.getLinks().clear();
 		Rectangle r = perm.getBounds();