From 532345e28a048b5fe8c6b487c014833c87631d91 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sun, 2 Nov 2014 12:12:39 +0100
Subject: [PATCH] * Darft - Play countdown sound during drafting only if no
 card from curretn booster was draft.

---
 .../src/main/java/mage/client/cards/DraftGrid.java | 14 +++++++++-----
 .../main/java/mage/client/draft/DraftPanel.form    |  3 ---
 .../main/java/mage/client/draft/DraftPanel.java    |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Mage.Client/src/main/java/mage/client/cards/DraftGrid.java b/Mage.Client/src/main/java/mage/client/cards/DraftGrid.java
index bcbcb99103c..60068309b24 100644
--- a/Mage.Client/src/main/java/mage/client/cards/DraftGrid.java
+++ b/Mage.Client/src/main/java/mage/client/cards/DraftGrid.java
@@ -65,13 +65,13 @@ public class DraftGrid extends javax.swing.JPanel implements MouseListener {
     protected CardEventSource cardEventSource = new CardEventSource();
     protected BigCard bigCard;
     protected MageCard markedCard;
-    protected boolean noSound;
+    protected boolean emptyGrid;
 
     /** Creates new form DraftGrid */
     public DraftGrid() {
         initComponents();
         markedCard = null;
-        noSound= true;
+        emptyGrid= true;
     }
 
     public void clear() {
@@ -86,12 +86,12 @@ public class DraftGrid extends javax.swing.JPanel implements MouseListener {
 
     public void loadBooster(CardsView booster, BigCard bigCard) {
         if (booster instanceof CardsView && booster.size() == 0) {
-            noSound = true;
+            emptyGrid = true;
         } else {
-            if (!noSound) {
+            if (!emptyGrid) {
                 AudioManager.playOnDraftSelect();
             }
-            noSound = false;
+            emptyGrid = false;
         }
         this.bigCard = bigCard;
         this.removeAll();
@@ -210,6 +210,10 @@ public class DraftGrid extends javax.swing.JPanel implements MouseListener {
 
     }
 
+    public boolean isEmptyGrid() {
+        return emptyGrid;
+    }
+
     @Override
     public void mouseReleased(MouseEvent e) {
     }
diff --git a/Mage.Client/src/main/java/mage/client/draft/DraftPanel.form b/Mage.Client/src/main/java/mage/client/draft/DraftPanel.form
index 73bf411eff7..c30f882c719 100644
--- a/Mage.Client/src/main/java/mage/client/draft/DraftPanel.form
+++ b/Mage.Client/src/main/java/mage/client/draft/DraftPanel.form
@@ -298,9 +298,6 @@
                     <Property name="requestFocusEnabled" type="boolean" value="false"/>
                     <Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/>
                   </Properties>
-                  <AccessibilityProperties>
-                    <Property name="AccessibleContext.accessibleName" type="java.lang.String" value=""/>
-                  </AccessibilityProperties>
                 </Component>
                 <Component class="javax.swing.JLabel" name="lblPlayer02">
                   <Properties>
diff --git a/Mage.Client/src/main/java/mage/client/draft/DraftPanel.java b/Mage.Client/src/main/java/mage/client/draft/DraftPanel.java
index c01cc033225..65d1ef0a9d8 100644
--- a/Mage.Client/src/main/java/mage/client/draft/DraftPanel.java
+++ b/Mage.Client/src/main/java/mage/client/draft/DraftPanel.java
@@ -261,7 +261,7 @@ public class DraftPanel extends javax.swing.JPanel {
             text = text + Integer.toString(second);
         }
         this.txtTimeRemaining.setText(text);
-        if (s==6) {
+        if (s==6 && !draftBooster.isEmptyGrid()) {
             AudioManager.playOnCountdown1();
         }
     }