Merge branch 'master' into changeToFinal

.gitignore

@@ -142,3 +142,7 @@ client_secrets.json
 dependency-reduced-pom.xml
 mage-bundle
 /Mage.Client/game-*.json
+
+# build-tools config and log files when building client/server with Atom
+.build-tools.cson
+build-output.log

Mage.Client/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-root</artifactId>
-        <version>1.4.29</version>
+        <version>1.4.30</version>
     </parent>
 
     <groupId>org.mage</groupId>

Mage.Client/src/main/java/mage/client/MageFrame.java

@@ -105,6 +105,10 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
     private static final String GRAY_MODE_ARG = "-gray";
     private static final String FILL_SCREEN_ARG = "-fullscreen";
     private static final String SKIP_DONE_SYMBOLS = "-skipDoneSymbols";
+    private static final String USER_ARG = "-user";
+    private static final String PASSWORD_ARG = "-pw";
+    private static final String SERVER_ARG = "-server";
+    private static final String PORT_ARG = "-port";
 
     private static final String NOT_CONNECTED_TEXT = "<not connected>";
     private static MageFrame instance;
@@ -123,6 +127,10 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
     private static boolean grayMode = false;
     private static boolean fullscreenMode = false;
     private static boolean skipSmallSymbolGenerationForExisting = false;
+    private static String startUser = null;
+    private static String startPassword = "";
+    private static String startServer = "localhost";
+    private static int startPort = -1;
 
     private static final Map<UUID, ChatPanelBasic> CHATS = new HashMap<>();
     private static final Map<UUID, GamePanel> GAMES = new HashMap<>();
@@ -732,7 +740,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
     }
 
     public boolean autoConnect() {
-        boolean autoConnectParamValue = Boolean.parseBoolean(PREFS.get("autoConnect", "false"));
+        boolean autoConnectParamValue = startUser != null || Boolean.parseBoolean(PREFS.get("autoConnect", "false"));
         boolean status = false;
         if (autoConnectParamValue) {
             status = performConnect(false);
@@ -1186,8 +1194,10 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 
         startTime = System.currentTimeMillis();
         Thread.setDefaultUncaughtExceptionHandler((t, e) -> LOGGER.fatal(null, e));
+        
         SwingUtilities.invokeLater(() -> {
-            for (String arg : args) {
+            for (int i = 0; i < args.length; i++) {
+                String arg = args[i];
                 if (arg.startsWith(LITE_MODE_ARG)) {
                     liteMode = true;
                 }
@@ -1200,6 +1210,22 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
                 if (arg.startsWith(SKIP_DONE_SYMBOLS)) {
                     skipSmallSymbolGenerationForExisting = true;
                 }
+                if (arg.startsWith(USER_ARG)){
+                    startUser = args[i+1];
+                    i++;
+                }
+                if (arg.startsWith(PASSWORD_ARG)){
+                    startPassword = args[i+1];
+                    i++;
+                }
+                if (arg.startsWith(SERVER_ARG)){
+                    startServer = args[i+1];
+                    i++;
+                }
+                if (arg.startsWith(PORT_ARG)){
+                    startPort = Integer.valueOf(args[i+1]);
+                    i++;
+                }
             }
             if (!liteMode) {
                 final SplashScreen splash = SplashScreen.getSplashScreen();
@@ -1212,6 +1238,19 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
                 }
             }
             instance = new MageFrame();
+            
+            if( startUser != null){
+                instance.currentConnection = new Connection();
+                instance.currentConnection.setUsername(startUser);
+                instance.currentConnection.setHost(startServer);
+                if (startPort > 0){
+                    instance.currentConnection.setPort(startPort);
+                }else {
+                    instance.currentConnection.setPort(MagePreferences.getServerPortWithDefault(Config.port));
+                }
+                PreferencesDialog.setProxyInformation(instance.currentConnection);
+                instance.currentConnection.setPassword(startPassword);
+            }
             instance.setVisible(true);
 
         });

Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.form

@@ -851,7 +851,6 @@
         </Component>
         <Component class="javax.swing.JCheckBox" name="chkUnique">
           <Properties>
-            <Property name="selected" type="boolean" value="false"/>
             <Property name="text" type="java.lang.String" value="Unique"/>
             <Property name="toolTipText" type="java.lang.String" value="Show only the first found card of every card name."/>
             <Property name="focusable" type="boolean" value="false"/>

Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java

@@ -51,13 +51,13 @@ import mage.client.MageFrame;
 import mage.client.cards.*;
 import mage.client.constants.Constants.SortBy;
 import mage.client.deckeditor.table.TableModel;
+import mage.client.dialog.CheckBoxList;
 import static mage.client.dialog.PreferencesDialog.KEY_DECK_EDITOR_SEARCH_NAMES;
 import static mage.client.dialog.PreferencesDialog.KEY_DECK_EDITOR_SEARCH_RULES;
 import static mage.client.dialog.PreferencesDialog.KEY_DECK_EDITOR_SEARCH_TYPES;
 import static mage.client.dialog.PreferencesDialog.KEY_DECK_EDITOR_SEARCH_UNIQUE;
 import mage.client.util.GUISizeHelper;
 import mage.client.util.gui.FastSearchUtil;
-import mage.client.dialog.CheckBoxList;
 import mage.client.util.sets.ConstructedFormats;
 import mage.constants.CardType;
 import mage.constants.Rarity;
@@ -85,7 +85,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
     private final SortSetting sortSetting;
     private static final Map<String, Integer> pdAllowed = new HashMap<>();
 
-    private final String TEST_MULTI_SET="Multiple Sets selected";
+    private final String TEST_MULTI_SET = "Multiple Sets selected";
 
     private final ActionListener searchAction = evt -> jButtonSearchActionPerformed(evt);
 
@@ -100,22 +100,20 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
         initListViewComponents();
         setGUISize();
         currentView = mainModel; // by default we use List View
-        
-         listCodeSelected = new CheckBoxList();
+
+        listCodeSelected = new CheckBoxList();
         // remove the all option
-        boolean is_removeFinish=false;
-        
-        String[] setCodes = ConstructedFormats.getTypes();       
-        java.util.List<String> result = new ArrayList<>();       
-       
-        for(int i=0; (i<setCodes.length)&&(!is_removeFinish);i++)
-        {
+        boolean is_removeFinish = false;
+
+        String[] setCodes = ConstructedFormats.getTypes();
+        java.util.List<String> result = new ArrayList<>();
+
+        for (int i = 0; (i < setCodes.length) && (!is_removeFinish); i++) {
             String item = setCodes[i];
-            if(!item.equals(ConstructedFormats.ALL))
-            {
+            if (!item.equals(ConstructedFormats.ALL)) {
                 result.add(item);
             }
-        }        
+        }
         listCodeSelected.setListData(result.toArray());
     }
 
@@ -377,33 +375,29 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
             criteria.rarities(Rarity.BONUS);
         }
         if (this.cbExpansionSet.isVisible()) {
-           if(listCodeSelected.getCheckedIndices().length <= 1)
-           {
-               String expansionSelection = this.cbExpansionSet.getSelectedItem().toString();
-               if (!expansionSelection.equals("- All Sets")) {
-                   java.util.List<String> setCodes = ConstructedFormats.getSetsByFormat(expansionSelection);
-                   criteria.setCodes(setCodes.toArray(new String[0]));
-               }
-           }
-           else
-           {
-               java.util.List<String> setCodes = new ArrayList<>() ;
-               //java.util.List<String> listReceived=new ArrayList<>() ;
+            if (listCodeSelected.getCheckedIndices().length <= 1) {
+                String expansionSelection = this.cbExpansionSet.getSelectedItem().toString();
+                if (!expansionSelection.equals("- All Sets")) {
+                    java.util.List<String> setCodes = ConstructedFormats.getSetsByFormat(expansionSelection);
+                    criteria.setCodes(setCodes.toArray(new String[0]));
+                }
+            } else {
+                java.util.List<String> setCodes = new ArrayList<>();
+                //java.util.List<String> listReceived=new ArrayList<>() ;
 
-               int[] choiseValue=listCodeSelected.getCheckedIndices();
-               ListModel x= listCodeSelected.getModel();
+                int[] choiseValue = listCodeSelected.getCheckedIndices();
+                ListModel x = listCodeSelected.getModel();
 
-               for(int itemIndex: choiseValue){
-
-               java.util.List<String> listReceived=ConstructedFormats.getSetsByFormat(x.getElementAt(itemIndex).toString());
-               listReceived.stream().filter((item) -> (setCodes.contains(item)==false)).forEachOrdered((item) -> {
-                   setCodes.add(item);
-                   });                               
-               }
-               criteria.setCodes(setCodes.toArray(new String[0]));
-           }
-       }
+                for (int itemIndex : choiseValue) {
 
+                    java.util.List<String> listReceived = ConstructedFormats.getSetsByFormat(x.getElementAt(itemIndex).toString());
+                    listReceived.stream().filter((item) -> (setCodes.contains(item) == false)).forEachOrdered((item) -> {
+                        setCodes.add(item);
+                    });
+                }
+                criteria.setCodes(setCodes.toArray(new String[0]));
+            }
+        }
 
         return criteria;
     }
@@ -1234,22 +1228,19 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
     }// </editor-fold>//GEN-END:initComponents
 
     private void cbExpansionSetActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cbExpansionSetActionPerformed
-        if(!cbExpansionSet.getSelectedItem().toString().contains(TEST_MULTI_SET))
-        {
-            int index=cbExpansionSet.getSelectedIndex();
-            if(cbExpansionSet.getItemAt(0).contains(TEST_MULTI_SET))
-            {
+        if (!cbExpansionSet.getSelectedItem().toString().contains(TEST_MULTI_SET)) {
+            int index = cbExpansionSet.getSelectedIndex();
+            if (cbExpansionSet.getItemAt(0).contains(TEST_MULTI_SET)) {
                 cbExpansionSet.removeItemAt(0);
                 index--;
             }
-            listCodeSelected.uncheckAll();      
-            if(index > 0)
-            {
+            listCodeSelected.uncheckAll();
+            if (index > 0) {
                 //ofset because all sets is removed from the list
-                listCodeSelected.setChecked(index-1, true);
+                listCodeSelected.setChecked(index - 1, true);
             }
         }
-        
+
         filterCards();
     }//GEN-LAST:event_cbExpansionSetActionPerformed
 
@@ -1422,62 +1413,53 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
         // TODO add your handling code here:
     }//GEN-LAST:event_chkTypesActionPerformed
 
-    private void chkRulesActionPerformed(java.awt.event.ActionEvent evt) {                                         
+    private void chkRulesActionPerformed(java.awt.event.ActionEvent evt) {
         // TODO add your handling code here:
-    }                                        
+    }
 
     private void chkUniqueActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_chkRulesActionPerformed
         // TODO add your handling code here:
     }//GEN-LAST:event_chkRulesActionPerformed
 
     private void btnExpansionSearchActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnExpansionSearchActionPerformed
-       FastSearchUtil.showFastSearchForStringComboBox(listCodeSelected, FastSearchUtil.DEFAULT_EXPANSION_SEARCH_MESSAGE);
+        FastSearchUtil.showFastSearchForStringComboBox(listCodeSelected, FastSearchUtil.DEFAULT_EXPANSION_SEARCH_MESSAGE);
 //
-    int[] choiseValue=listCodeSelected.getCheckedIndices();
-        ListModel x= listCodeSelected.getModel();
-        
-        if(choiseValue.length==0)//none
+        int[] choiseValue = listCodeSelected.getCheckedIndices();
+        ListModel x = listCodeSelected.getModel();
+
+        if (choiseValue.length == 0)//none
         {
-            cbExpansionSet.setSelectedIndex(0);        
-        }
-        else if(choiseValue.length==1)//one
+            cbExpansionSet.setSelectedIndex(0);
+        } else if (choiseValue.length == 1)//one
         {
-            String itemSelected=listCodeSelected.getModel().getElementAt(choiseValue[0]).toString();
-            for(int index=0;index < cbExpansionSet.getItemCount();index++)
-            {
-                if(cbExpansionSet.getItemAt(index).equals(itemSelected))
-                {
+            String itemSelected = listCodeSelected.getModel().getElementAt(choiseValue[0]).toString();
+            for (int index = 0; index < cbExpansionSet.getItemCount(); index++) {
+                if (cbExpansionSet.getItemAt(index).equals(itemSelected)) {
                     cbExpansionSet.setSelectedIndex(index);
                 }
             }
-            
-        }
-        else//many
+
+        } else//many
         {
-            String message=String.format("%s:%d",TEST_MULTI_SET,choiseValue.length);
-            
-            
-            
+            String message = String.format("%s:%d", TEST_MULTI_SET, choiseValue.length);
+
             cbExpansionSet.insertItemAt(message, 0);
             cbExpansionSet.setSelectedIndex(0);
-            
-            if(cbExpansionSet.getItemAt(1).contains(TEST_MULTI_SET))
-            {
-               cbExpansionSet.removeItemAt(1); 
+
+            if (cbExpansionSet.getItemAt(1).contains(TEST_MULTI_SET)) {
+                cbExpansionSet.removeItemAt(1);
             }
-            
-            
+
             //listCodeSelected.setChecked(index-1, true);
-          //cbExpansionSet.  
+            //cbExpansionSet.
         }
-        
-        /*for(int itemIndex: choiseValue){                    
+
+        /*for(int itemIndex: choiseValue){
                   //  LogLog.warn(String.format("%d:%s",itemIndex,x.getElementAt(itemIndex).toString()));
         }
-        */
+         */
 //
-
-       filterCards();
+        filterCards();
     }//GEN-LAST:event_btnExpansionSearchActionPerformed
 
     private void tbCommonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_tbCommonActionPerformed
@@ -1537,8 +1519,8 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
     private TableModel mainModel;
     private JTable mainTable;
     private ICardGrid currentView;
-    
-    private CheckBoxList listCodeSelected;
+
+    private final CheckBoxList listCodeSelected;
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.ButtonGroup bgView;

Mage.Client/src/main/java/mage/client/deckeditor/table/MageCardComparator.java

@@ -26,11 +26,10 @@
  */
 package mage.client.deckeditor.table;
 
+import java.util.Comparator;
 import mage.cards.MageCard;
 import mage.view.CardView;
 
-import java.util.Comparator;
-
 /**
  * {@link MageCard} comparator. Used to sort cards in Deck Editor Table View
  * pane.
@@ -75,7 +74,7 @@ public class MageCardComparator implements Comparator<CardView> {
             // Color
             case 3:
                 aCom = a.getColorText();
-                bCom = a.getColorText();
+                bCom = b.getColorText();
                 break;
             // Type
             case 4:

Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java

@@ -203,6 +203,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
     public static final String KEY_TABLES_DIVIDER_LOCATION_1 = "tablePanelDividerLocation1";
     public static final String KEY_TABLES_DIVIDER_LOCATION_2 = "tablePanelDividerLocation2";
     public static final String KEY_TABLES_DIVIDER_LOCATION_3 = "tablePanelDividerLocation3";
+    public static final String KEY_TABLES_DIVIDER_LOCATION_4 = "tablePanelDividerLocation4";
 
     // Positions of deck editor divider bars
     public static final String KEY_EDITOR_HORIZONTAL_DIVIDER_LOCATION = "editorHorizontalDividerLocation";

Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.form

@@ -111,7 +111,7 @@
 
           <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
           <SubComponents>
-            <Component class="javax.swing.JTable" name="tableSeats">
+            <Component class="javax.swing.JTable" name="jTableSeats">
               <Properties>
                 <Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
                   <Connection code="tableWaitModel" type="code"/>

Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.java

@@ -34,6 +34,7 @@
 package mage.client.dialog;
 
 import java.awt.Dimension;
+import java.awt.Rectangle;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
@@ -43,22 +44,26 @@ import java.util.concurrent.TimeUnit;
 import javax.swing.Icon;
 import javax.swing.SwingWorker;
 import javax.swing.table.AbstractTableModel;
+import org.apache.log4j.Logger;
+
 import mage.client.MageFrame;
 import mage.client.SessionHandler;
 import mage.client.chat.ChatPanelBasic;
 import mage.client.components.MageComponents;
 import mage.client.components.tray.MageTray;
-import static mage.client.dialog.PreferencesDialog.KEY_TABLE_WAITING_COLUMNS_ORDER;
-import static mage.client.dialog.PreferencesDialog.KEY_TABLE_WAITING_COLUMNS_WIDTH;
 import mage.client.util.GUISizeHelper;
 import mage.client.util.audio.AudioManager;
 import mage.client.util.gui.TableUtil;
 import mage.client.util.gui.countryBox.CountryCellRenderer;
+import mage.client.util.gui.GuiDisplayUtil;
 import mage.players.PlayerType;
 import mage.remote.Session;
 import mage.view.SeatView;
 import mage.view.TableView;
-import org.apache.log4j.Logger;
+
+import static mage.client.dialog.PreferencesDialog.KEY_TABLE_WAITING_COLUMNS_ORDER;
+import static mage.client.dialog.PreferencesDialog.KEY_TABLE_WAITING_COLUMNS_WIDTH;
+import static mage.client.dialog.PreferencesDialog.KEY_TABLES_DIVIDER_LOCATION_4;
 
 /**
  * @author BetaSteward_at_googlemail.com
@@ -66,7 +71,7 @@ import org.apache.log4j.Logger;
 public class TableWaitingDialog extends MageDialog {
 
     private static final Logger LOGGER = Logger.getLogger(TableWaitingDialog.class);
-    private static final int[] DEFAULT_COLUMS_WIDTH = {20, 50, 100, 100, 100};
+    private static final int[] DEFAULT_COLUMNS_WIDTH = {20, 50, 100, 100, 100, 100};
 
     private UUID tableId;
     private UUID roomId;
@@ -89,12 +94,12 @@ public class TableWaitingDialog extends MageDialog {
             this.setSize(prefWidth, prefHeight);
         }
 
-        chatPanel.useExtendedView(ChatPanelBasic.VIEW_MODE.NONE);
-        tableSeats.createDefaultColumnsFromModel();
-        TableUtil.setColumnWidthAndOrder(tableSeats, DEFAULT_COLUMS_WIDTH, KEY_TABLE_WAITING_COLUMNS_WIDTH, KEY_TABLE_WAITING_COLUMNS_ORDER);
-        tableSeats.setDefaultRenderer(Icon.class, new CountryCellRenderer());
         setGUISize();
-
+        jTableSeats.createDefaultColumnsFromModel();
+        jTableSeats.setAutoCreateColumnsFromModel(false);
+        jTableSeats.setDefaultRenderer(Icon.class, new CountryCellRenderer());
+        TableUtil.setColumnWidthAndOrder(jTableSeats, DEFAULT_COLUMNS_WIDTH, KEY_TABLE_WAITING_COLUMNS_WIDTH, KEY_TABLE_WAITING_COLUMNS_ORDER);
+        chatPanel.useExtendedView(ChatPanelBasic.VIEW_MODE.NONE);
         MageFrame.getUI().addButton(MageComponents.TABLE_WAITING_START_BUTTON, btnStart);
     }
 
@@ -104,9 +109,9 @@ public class TableWaitingDialog extends MageDialog {
     }
 
     private void setGUISize() {
-        tableSeats.getTableHeader().setFont(GUISizeHelper.tableFont);
-        tableSeats.setFont(GUISizeHelper.tableFont);
-        tableSeats.setRowHeight(GUISizeHelper.getTableRowHeight());
+        jTableSeats.getTableHeader().setFont(GUISizeHelper.tableFont);
+        jTableSeats.setFont(GUISizeHelper.tableFont);
+        jTableSeats.setRowHeight(GUISizeHelper.getTableRowHeight());
 
         jSplitPane1.setDividerSize(GUISizeHelper.dividerBarSize);
         jScrollPane1.getVerticalScrollBar().setPreferredSize(new Dimension(GUISizeHelper.scrollBarSize, 0));
@@ -131,14 +136,14 @@ public class TableWaitingDialog extends MageDialog {
                         closeDialog();
                         return;
                 }
-                int row = this.tableSeats.getSelectedRow();
+                int row = this.jTableSeats.getSelectedRow();
                 if (getTitle().equals("Waiting for players")) {
                     this.title = getTitle() + " - " + table.getDeckType() + " / " + table.getGameType();
                     this.repaint();
                 }
                 tableWaitModel.loadData(table);
-                this.tableSeats.repaint();
-                this.tableSeats.getSelectionModel().setSelectionInterval(row, row);
+                this.jTableSeats.repaint();
+                this.jTableSeats.getSelectionModel().setSelectionInterval(row, row);
             } else {
                 closeDialog();
             }
@@ -148,10 +153,15 @@ public class TableWaitingDialog extends MageDialog {
     }
 
     public void showDialog(UUID roomId, UUID tableId, boolean isTournament) {
+        Rectangle currentBounds = MageFrame.getDesktop().getBounds();
+        Optional<UUID> chatId = SessionHandler.getTableChatId(tableId);
+        String tournamentChatDivider = PreferencesDialog.getCachedValue(KEY_TABLES_DIVIDER_LOCATION_4, null);
+        updateTask = new UpdateSeatsTask(SessionHandler.getSession(), roomId, tableId, this);
+
         this.roomId = roomId;
         this.tableId = tableId;
         this.isTournament = isTournament;
-        updateTask = new UpdateSeatsTask(SessionHandler.getSession(), roomId, tableId, this);
+
         if (SessionHandler.isTableOwner(roomId, tableId)) {
             this.btnStart.setVisible(true);
             this.btnMoveDown.setVisible(true);
@@ -161,13 +171,15 @@ public class TableWaitingDialog extends MageDialog {
             this.btnMoveDown.setVisible(false);
             this.btnMoveUp.setVisible(false);
         }
-        Optional<UUID> chatId = SessionHandler.getTableChatId(tableId);
+
         if (chatId.isPresent()) {
             this.chatPanel.connect(chatId.get());
             updateTask.execute();
             this.setModal(false);
             this.setLocation(100, 100);
             this.setVisible(true);
+
+            GuiDisplayUtil.restoreDividerLocations(currentBounds, tournamentChatDivider, jSplitPane1);
         } else {
             closeDialog();
         }
@@ -177,12 +189,13 @@ public class TableWaitingDialog extends MageDialog {
         if (updateTask != null) {
             updateTask.cancel(true);
         }
+
         this.chatPanel.disconnect();
         MageFrame.getUI().removeButton(MageComponents.TABLE_WAITING_START_BUTTON);
         this.removeDialog();
-        TableUtil.saveColumnWidthAndOrderToPrefs(tableSeats, KEY_TABLE_WAITING_COLUMNS_WIDTH, KEY_TABLE_WAITING_COLUMNS_ORDER);
-        PreferencesDialog.saveValue(PreferencesDialog.KEY_TABLE_WAITING_WIDTH, Integer.toString(getWidth()));
-        PreferencesDialog.saveValue(PreferencesDialog.KEY_TABLE_WAITING_HEIGHT, Integer.toString(getHeight()));
+        TableUtil.saveColumnWidthAndOrderToPrefs(jTableSeats, KEY_TABLE_WAITING_COLUMNS_WIDTH, KEY_TABLE_WAITING_COLUMNS_ORDER);
+        GuiDisplayUtil.saveCurrentBoundsToPrefs();
+        GuiDisplayUtil.saveDividerLocationToPrefs(KEY_TABLES_DIVIDER_LOCATION_4, this.jSplitPane1.getDividerLocation());
     }
 
     /**
@@ -200,7 +213,7 @@ public class TableWaitingDialog extends MageDialog {
         btnStart = new javax.swing.JButton();
         jSplitPane1 = new javax.swing.JSplitPane();
         jScrollPane1 = new javax.swing.JScrollPane();
-        tableSeats = new javax.swing.JTable();
+        jTableSeats = new javax.swing.JTable();
         chatPanel = new mage.client.chat.ChatPanelBasic();
 
         setResizable(true);
@@ -226,9 +239,9 @@ public class TableWaitingDialog extends MageDialog {
         jSplitPane1.setResizeWeight(1.0);
         jSplitPane1.setToolTipText("");
 
-        tableSeats.setModel(tableWaitModel);
-        tableSeats.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);
-        jScrollPane1.setViewportView(tableSeats);
+        jTableSeats.setModel(tableWaitModel);
+        jTableSeats.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);
+        jScrollPane1.setViewportView(jTableSeats);
 
         jSplitPane1.setLeftComponent(jScrollPane1);
         jSplitPane1.setRightComponent(chatPanel);
@@ -288,19 +301,19 @@ public class TableWaitingDialog extends MageDialog {
     }//GEN-LAST:event_btnCancelActionPerformed
 
     private void btnMoveDownActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnMoveDownActionPerformed
-        int row = this.tableSeats.getSelectedRow();
-        if (row < this.tableSeats.getRowCount() - 1) {
+        int row = this.jTableSeats.getSelectedRow();
+        if (row < this.jTableSeats.getRowCount() - 1) {
             SessionHandler.swapSeats(roomId, tableId, row, row + 1);
-            this.tableSeats.getSelectionModel().setSelectionInterval(row + 1, row + 1);
+            this.jTableSeats.getSelectionModel().setSelectionInterval(row + 1, row + 1);
         }
 
     }//GEN-LAST:event_btnMoveDownActionPerformed
 
     private void btnMoveUpActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnMoveUpActionPerformed
-        int row = this.tableSeats.getSelectedRow();
+        int row = this.jTableSeats.getSelectedRow();
         if (row > 0) {
             SessionHandler.swapSeats(roomId, tableId, row, row - 1);
-            this.tableSeats.getSelectionModel().setSelectionInterval(row - 1, row - 1);
+            this.jTableSeats.getSelectionModel().setSelectionInterval(row - 1, row - 1);
         }
     }//GEN-LAST:event_btnMoveUpActionPerformed
 
@@ -312,7 +325,7 @@ public class TableWaitingDialog extends MageDialog {
     private mage.client.chat.ChatPanelBasic chatPanel;
     private javax.swing.JScrollPane jScrollPane1;
     private javax.swing.JSplitPane jSplitPane1;
-    private javax.swing.JTable tableSeats;
+    private javax.swing.JTable jTableSeats;
     // End of variables declaration//GEN-END:variables
 
 }

Mage.Client/src/main/java/mage/client/table/TablesPanel.java

@@ -56,6 +56,10 @@ import mage.client.components.MageComponents;
 import mage.client.dialog.*;
 import static mage.client.dialog.PreferencesDialog.KEY_TABLES_COLUMNS_ORDER;
 import static mage.client.dialog.PreferencesDialog.KEY_TABLES_COLUMNS_WIDTH;
+import static mage.client.dialog.PreferencesDialog.KEY_TABLES_FILTER_SETTINGS;
+import static mage.client.dialog.PreferencesDialog.KEY_TABLES_DIVIDER_LOCATION_1;
+import static mage.client.dialog.PreferencesDialog.KEY_TABLES_DIVIDER_LOCATION_2;
+import static mage.client.dialog.PreferencesDialog.KEY_TABLES_DIVIDER_LOCATION_3;
 import mage.client.util.ButtonColumn;
 import mage.client.util.GUISizeHelper;
 import mage.client.util.IgnoreList;
@@ -191,8 +195,7 @@ public class TablesPanel extends javax.swing.JPanel {
         list.add(new RowSorter.SortKey(TableTableModel.COLUMN_CREATED, SortOrder.DESCENDING));
         activeTablesSorter.setSortKeys(list);
 
-        TableUtil.setColumnWidthAndOrder(tableTables, DEFAULT_COLUMNS_WIDTH,
-                PreferencesDialog.KEY_TABLES_COLUMNS_WIDTH, PreferencesDialog.KEY_TABLES_COLUMNS_ORDER); // TODO: is sort order save and restore after app restart/window open?
+        TableUtil.setColumnWidthAndOrder(tableTables, DEFAULT_COLUMNS_WIDTH, KEY_TABLES_COLUMNS_WIDTH, KEY_TABLES_COLUMNS_ORDER);
 
         // 2. TABLE COMPLETED
         completedTablesSorter = new MageTableRowSorter(matchesModel);
@@ -227,8 +230,7 @@ public class TablesPanel extends javax.swing.JPanel {
         jScrollPaneTablesActive.getViewport().setBackground(new Color(255, 255, 255, 50));
         jScrollPaneTablesFinished.getViewport().setBackground(new Color(255, 255, 255, 50));
 
-        restoreSettings();
-
+        restoreFilters();
         setGUISize();
 
         Action openTableAction;
@@ -343,7 +345,7 @@ public class TablesPanel extends javax.swing.JPanel {
     }
 
     public void cleanUp() {
-        saveSettings();
+        saveGuiSettings();
         chatPanelMain.cleanUp();
     }
 
@@ -406,65 +408,32 @@ public class TablesPanel extends javax.swing.JPanel {
     }
 
     private void saveDividerLocations() {
-        // save panel sizes and divider locations.
-        Rectangle rec = MageFrame.getDesktop().getBounds();
-        String sb = Double.toString(rec.getWidth()) + 'x' + Double.toString(rec.getHeight());
-        PreferencesDialog.saveValue(PreferencesDialog.KEY_MAGE_PANEL_LAST_SIZE, sb);
-        PreferencesDialog.saveValue(PreferencesDialog.KEY_TABLES_DIVIDER_LOCATION_1, Integer.toString(this.jSplitPane1.getDividerLocation()));
-        PreferencesDialog.saveValue(PreferencesDialog.KEY_TABLES_DIVIDER_LOCATION_2, Integer.toString(this.jSplitPaneTables.getDividerLocation()));
-        PreferencesDialog.saveValue(PreferencesDialog.KEY_TABLES_DIVIDER_LOCATION_3, Integer.toString(chatPanelMain.getSplitDividerLocation()));
+        // save divider locations and divider saveDividerLocations
+        GuiDisplayUtil.saveCurrentBoundsToPrefs();
+        GuiDisplayUtil.saveDividerLocationToPrefs(KEY_TABLES_DIVIDER_LOCATION_1, this.jSplitPane1.getDividerLocation());
+        GuiDisplayUtil.saveDividerLocationToPrefs(KEY_TABLES_DIVIDER_LOCATION_2, this.jSplitPaneTables.getDividerLocation());
+        GuiDisplayUtil.saveDividerLocationToPrefs(KEY_TABLES_DIVIDER_LOCATION_3, chatPanelMain.getSplitDividerLocation());
     }
 
-    private void restoreSettings() {
-        // filter settings
-        String formatSettings = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_TABLES_FILTER_SETTINGS, "");
-        int i = 0;
-        for (JToggleButton component : filterButtons) {
-            if (formatSettings.length() > i) {
-                component.setSelected(formatSettings.substring(i, i + 1).equals("x"));
-            } else {
-                component.setSelected(true);
-            }
-            i++;
-        }
+    private void restoreFilters() {
+        TableUtil.setActiveFilters(KEY_TABLES_FILTER_SETTINGS, filterButtons);
         setTableFilter();
     }
 
-    private void saveSettings() {
-        // Filters
-        StringBuilder formatSettings = new StringBuilder();
-        for (JToggleButton component : filterButtons) {
-            formatSettings.append(component.isSelected() ? "x" : "-");
-        }
-        PreferencesDialog.saveValue(PreferencesDialog.KEY_TABLES_FILTER_SETTINGS, formatSettings.toString());
-
+    private void saveGuiSettings() {
+        TableUtil.saveActiveFiltersToPrefs(KEY_TABLES_FILTER_SETTINGS, filterButtons);
         TableUtil.saveColumnWidthAndOrderToPrefs(tableTables, KEY_TABLES_COLUMNS_WIDTH, KEY_TABLES_COLUMNS_ORDER);
     }
 
-    private void restoreDividerLocations() {
-        Rectangle rec = MageFrame.getDesktop().getBounds();
-        if (rec != null) {
-            String size = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_MAGE_PANEL_LAST_SIZE, null);
-            String sb = Double.toString(rec.getWidth()) + 'x' + Double.toString(rec.getHeight());
-            // use divider positions only if screen size is the same as it was the time the settings were saved
-            if (size != null && size.equals(sb)) {
-                String location = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_TABLES_DIVIDER_LOCATION_1, null);
-                if (location != null && jSplitPane1 != null) {
-                    jSplitPane1.setDividerLocation(Integer.parseInt(location));
-                }
-                if (this.btnStateFinished.isSelected()) {
-                    this.jSplitPaneTables.setDividerLocation(-1);
-                } else {
-                    location = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_TABLES_DIVIDER_LOCATION_2, null);
-                    if (location != null && jSplitPaneTables != null) {
-                        jSplitPaneTables.setDividerLocation(Integer.parseInt(location));
-                    }
-                }
-                location = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_TABLES_DIVIDER_LOCATION_3, null);
-                if (location != null && chatPanelMain != null) {
-                    chatPanelMain.setSplitDividerLocation(Integer.parseInt(location));
-                }
-            }
+    private void restoreDividers() {
+        Rectangle currentBounds = MageFrame.getDesktop().getBounds();
+        if (currentBounds != null) {
+            String firstDivider = PreferencesDialog.getCachedValue(KEY_TABLES_DIVIDER_LOCATION_1, null);
+            String tableDivider = PreferencesDialog.getCachedValue(KEY_TABLES_DIVIDER_LOCATION_2, null);
+            String chatDivider = PreferencesDialog.getCachedValue(KEY_TABLES_DIVIDER_LOCATION_3, null);
+            GuiDisplayUtil.restoreDividerLocations(currentBounds, firstDivider, jSplitPane1);
+            GuiDisplayUtil.restoreDividerLocations(currentBounds, tableDivider, jSplitPaneTables);
+            GuiDisplayUtil.restoreDividerLocations(currentBounds, chatDivider, chatPanelMain);
         }
     }
 
@@ -565,7 +534,7 @@ public class TablesPanel extends javax.swing.JPanel {
         MageFrame.getUI().addButton(MageComponents.NEW_GAME_BUTTON, btnNewTable);
 
         // divider locations have to be set with delay else values set are overwritten with system defaults
-        Executors.newSingleThreadScheduledExecutor().schedule(() -> restoreDividerLocations(), 300, TimeUnit.MILLISECONDS);
+        Executors.newSingleThreadScheduledExecutor().schedule(() -> restoreDividers(), 300, TimeUnit.MILLISECONDS);
 
     }
 
@@ -580,6 +549,7 @@ public class TablesPanel extends javax.swing.JPanel {
             this.jPanelBottom.setVisible(false);
         } else {
             this.jPanelBottom.setVisible(true);
+            URLHandler.RemoveMouseAdapter(jLabelFooterText);
             URLHandler.handleMessage(serverMessages.get(0), this.jLabelFooterText);
             this.jButtonFooterNext.setVisible(serverMessages.size() > 1);
         }
@@ -1284,7 +1254,7 @@ public class TablesPanel extends javax.swing.JPanel {
                 if (currentMessage >= messages.size()) {
                     currentMessage = 0;
                 }
-                
+
                 URLHandler.RemoveMouseAdapter(jLabelFooterText);
                 URLHandler.handleMessage(messages.get(currentMessage), this.jLabelFooterText);
             }
@@ -1447,7 +1417,7 @@ class TableTableModel extends AbstractTableModel {
                         if (tables[arg0].isTournament()) {
                             return "Show";
                         } else {
-                            owner = tables[arg0].getControllerName();                            
+                            owner = tables[arg0].getControllerName();
                             if (SessionHandler.getSession() != null && owner.equals(SessionHandler.getUserName())) {
                                 return "";
                             }

Mage.Client/src/main/java/mage/client/util/URLHandler.java

@@ -9,10 +9,10 @@ import java.awt.Desktop;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.IOException;
-import java.net.URL;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URL;
 import javax.swing.JLabel;
 
 /**
@@ -47,6 +47,7 @@ public class URLHandler {
 
     private static MouseAdapter createMouseAdapter(String url) {
         currentMouseAdapter = new MouseAdapter() {
+            @Override
             public void mouseClicked(MouseEvent e) {
                 if (e.getClickCount() > 0) {
                     if (Desktop.isDesktopSupported()) {
@@ -57,7 +58,7 @@ public class URLHandler {
                         } catch (IOException | URISyntaxException ex) {
                             // do nothing
                         }
-                    } 
+                    }
                 }
             }
         };

Mage.Client/src/main/java/mage/client/util/gui/GuiDisplayUtil.java

@@ -4,8 +4,11 @@ import java.awt.*;
 import java.util.ArrayList;
 import java.util.Locale;
 import javax.swing.*;
+import mage.client.dialog.PreferencesDialog;
+import static mage.client.dialog.PreferencesDialog.KEY_MAGE_PANEL_LAST_SIZE;
 import mage.client.MageFrame;
 import mage.client.util.GUISizeHelper;
+import mage.client.table.*;
 import mage.constants.*;
 import mage.view.CardView;
 import mage.view.CounterView;
@@ -26,6 +29,35 @@ public final class GuiDisplayUtil {
         public ArrayList<String> lines;
     }
 
+    public static void restoreDividerLocations(Rectangle bounds, String lastDividerLocation, JComponent component) {
+      String currentBounds = Double.toString(bounds.getWidth()) + 'x' + Double.toString(bounds.getHeight());
+      String savedBounds = PreferencesDialog.getCachedValue(KEY_MAGE_PANEL_LAST_SIZE, null);
+      // use divider positions only if screen size is the same as it was the time the settings were saved
+      if (savedBounds != null && savedBounds.equals(currentBounds)) {
+        if (lastDividerLocation != null && component != null) {
+          if (component instanceof JSplitPane) {
+            JSplitPane jSplitPane = (JSplitPane) component;
+            jSplitPane.setDividerLocation(Integer.parseInt(lastDividerLocation));
+          }
+
+          if (component instanceof PlayersChatPanel) {
+            PlayersChatPanel playerChatPanel = (PlayersChatPanel) component;
+            playerChatPanel.setSplitDividerLocation(Integer.parseInt(lastDividerLocation));
+          }
+        }
+      }
+    }
+
+    public static void saveCurrentBoundsToPrefs() {
+      Rectangle rec = MageFrame.getDesktop().getBounds();
+      String currentBounds = Double.toString(rec.getWidth()) + 'x' + Double.toString(rec.getHeight());
+      PreferencesDialog.saveValue(KEY_MAGE_PANEL_LAST_SIZE, currentBounds);
+    }
+
+    public static void saveDividerLocationToPrefs(String dividerPrefKey, int position) {
+      PreferencesDialog.saveValue(dividerPrefKey, Integer.toString(position));
+    }
+
     public static JXPanel getDescription(CardView card, int width, int height) {
         JXPanel descriptionPanel = new JXPanel();
 

Mage.Client/src/main/java/mage/client/util/gui/TableUtil.java

@@ -5,8 +5,11 @@
  */
 package mage.client.util.gui;
 
+import java.util.Arrays;
 import javax.swing.JTable;
+import javax.swing.JToggleButton;
 import javax.swing.table.TableColumn;
+import org.apache.log4j.Logger;
 import mage.client.dialog.PreferencesDialog;
 
 /**
@@ -22,7 +25,32 @@ public final class TableUtil {
      * @param widthPrefKey
      * @param orderPrefKey
      */
-    static public void setColumnWidthAndOrder(JTable table, int[] defaultColumnsWidth, String widthPrefKey, String orderPrefKey) {
+
+    private static final Logger LOGGER = Logger.getLogger(TableUtil.class);
+
+    public static void saveActiveFiltersToPrefs(String filterPrefKey, JToggleButton[] buttons) {
+      StringBuilder currentFilters = new StringBuilder();
+      for (JToggleButton component : buttons) {
+          currentFilters.append(component.isSelected() ? "x" : "-");
+      }
+
+      PreferencesDialog.saveValue(filterPrefKey, currentFilters.toString());
+    }
+
+    public static void setActiveFilters(String filterPrefKey, JToggleButton[] buttons) {
+        String formatSettings = PreferencesDialog.getCachedValue(filterPrefKey, "");
+        int i = 0;
+        for (JToggleButton component : buttons) {
+            if (formatSettings.length() > i) {
+                component.setSelected(formatSettings.substring(i, i + 1).equals("x"));
+            } else {
+                component.setSelected(true);
+            }
+            i++;
+        }
+    }
+
+    public static void setColumnWidthAndOrder(JTable table, int[] defaultColumnsWidth, String widthPrefKey, String orderPrefKey) {
         table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
 
         // set the column width from saved value or defaults
@@ -51,11 +79,11 @@ public final class TableUtil {
 
     }
 
-    static public void saveColumnWidthAndOrderToPrefs(JTable table, String widthPrefKey, String orderPrefKey) {
-        // Column width
+    public static void saveColumnWidthAndOrderToPrefs(JTable table, String widthPrefKey, String orderPrefKey) {
         StringBuilder columnWidthSettings = new StringBuilder();
         StringBuilder columnOrderSettings = new StringBuilder();
         boolean firstValue = true;
+
         for (int i = 0; i < table.getColumnModel().getColumnCount(); i++) {
             TableColumn column = table.getColumnModel().getColumn(table.convertColumnIndexToView(i));
             if (!firstValue) {
@@ -67,12 +95,12 @@ public final class TableUtil {
             columnWidthSettings.append(column.getWidth());
             columnOrderSettings.append(table.convertColumnIndexToModel(i));
         }
+
         PreferencesDialog.saveValue(widthPrefKey, columnWidthSettings.toString());
         PreferencesDialog.saveValue(orderPrefKey, columnOrderSettings.toString());
-
     }
 
-    public static int[] getIntArrayFromString(String stringData) {
+    private static int[] getIntArrayFromString(String stringData) {
         int[] intArray = null;
         if (stringData != null && !stringData.isEmpty()) {
             String[] items = stringData.split(",");

Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MythicspoilerComSource.java

@@ -257,6 +257,7 @@ public enum MythicspoilerComSource implements CardImageSource {
         supportedSets.add("UST");
         supportedSets.add("RIX");
         supportedSets.add("DOM");
+        supportedSets.add("BBD");
 
         sets = new LinkedHashMap<>();
         setsAliases = new HashMap<>();

Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSource.java

@@ -210,6 +210,7 @@ public enum ScryfallImageSource implements CardImageSource {
         supportedSets.add("PPRO");
         supportedSets.add("A25");
         supportedSets.add("DOM");
+        supportedSets.add("BBD");
 //        supportedSets.add("M19");
 
     }

Mage.Common/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-root</artifactId>
-        <version>1.4.29</version>
+        <version>1.4.30</version>
     </parent>
 
     <artifactId>mage-common</artifactId>

Mage.Common/src/main/java/mage/utils/MageVersion.java

@@ -40,8 +40,8 @@ public class MageVersion implements Serializable, Comparable<MageVersion> {
      */
     public final static int MAGE_VERSION_MAJOR = 1;
     public final static int MAGE_VERSION_MINOR = 4;
-    public final static int MAGE_VERSION_PATCH = 29;
-    public final static String MAGE_VERSION_MINOR_PATCH = "V4";
+    public final static int MAGE_VERSION_PATCH = 30;
+    public final static String MAGE_VERSION_MINOR_PATCH = "V1";
     public final static String MAGE_VERSION_INFO = "";
 
     private final int major;

Mage.Plugins/Mage.Counter.Plugin/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-plugins</artifactId>
-        <version>1.4.29</version>
+        <version>1.4.30</version>
     </parent>
 
     <artifactId>mage-counter-plugin</artifactId>

Mage.Plugins/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-root</artifactId>
-        <version>1.4.29</version>
+        <version>1.4.30</version>
     </parent>
 
     <artifactId>mage-plugins</artifactId>

Mage.Server.Console/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-root</artifactId>
-        <version>1.4.29</version>
+        <version>1.4.30</version>
     </parent>
 
     <groupId>org.mage</groupId>

Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.29</version>
+        <version>1.4.30</version>
     </parent>
 
     <artifactId>mage-deck-constructed</artifactId>

Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Brawl.java

@@ -149,10 +149,12 @@ public class Brawl extends Constructed {
                 if (commanderColor.isGreen()) {
                     colorIdentity.setGreen(true);
                 }
+                if (commanderColor.isColorless()) {
+                    colorIdentity.setColorless(true);
+                }
             }
         }
-
-        List<String> basicsInDeck = new ArrayList<>();
+        Set<String> basicsInDeck = new HashSet<>();
         if (colorIdentity.isColorless()) {
             for (Card card : deck.getCards()) {
                 if (basicLandNames.contains(card.getName())) {

Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Commander.java

@@ -33,6 +33,7 @@ import mage.abilities.Ability;
 import mage.abilities.common.CanBeYourCommanderAbility;
 import mage.abilities.costs.mana.ManaCost;
 import mage.abilities.keyword.PartnerAbility;
+import mage.abilities.keyword.PartnerWithAbility;
 import mage.cards.Card;
 import mage.cards.ExpansionSet;
 import mage.cards.Sets;
@@ -133,6 +134,10 @@ public class Commander extends Constructed {
             invalid.put("Commander", "Sideboard must contain only the commander(s)");
             valid = false;
         } else {
+            Set<String> commanderNames = new HashSet<>();
+            for (Card commander : deck.getSideboard()) {
+                commanderNames.add(commander.getName());
+            }
             for (Card commander : deck.getSideboard()) {
                 if (bannedCommander.contains(commander.getName())) {
                     invalid.put("Commander", "Commander banned (" + commander.getName() + ')');
@@ -144,8 +149,18 @@ public class Commander extends Constructed {
                     valid = false;
                 }
                 if (deck.getSideboard().size() == 2 && !commander.getAbilities().contains(PartnerAbility.getInstance())) {
-                    invalid.put("Commander", "Commander without Partner (" + commander.getName() + ')');
-                    valid = false;
+                    boolean partnersWith = false;
+                    for (Ability ability : commander.getAbilities()) {
+                        if (ability instanceof PartnerWithAbility
+                                && commanderNames.contains(((PartnerWithAbility) ability).getPartnerName())) {
+                            partnersWith = true;
+                            break;
+                        }
+                    }
+                    if (!partnersWith) {
+                        invalid.put("Commander", "Commander without Partner (" + commander.getName() + ')');
+                        valid = false;
+                    }
                 }
                 FilterMana commanderColor = commander.getColorIdentity();
                 if (commanderColor.isWhite()) {

Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/FreeformCommander.java

@@ -28,15 +28,14 @@
 package mage.deck;
 
 import java.util.*;
-import java.util.Map.Entry;
-import mage.abilities.common.CanBeYourCommanderAbility;
+import mage.abilities.Ability;
 import mage.abilities.keyword.PartnerAbility;
+import mage.abilities.keyword.PartnerWithAbility;
 import mage.cards.Card;
 import mage.cards.ExpansionSet;
 import mage.cards.Sets;
 import mage.cards.decks.Constructed;
 import mage.cards.decks.Deck;
-import mage.constants.SetType;
 import mage.filter.FilterMana;
 
 /**
@@ -90,15 +89,29 @@ public class FreeformCommander extends Constructed {
             invalid.put("Commander", "Sideboard must contain only the commander(s)");
             valid = false;
         } else {
+            Set<String> commanderNames = new HashSet<>();
             for (Card commander : deck.getSideboard()) {
-                if (!(commander.isCreature() ||
-                    commander.isLegendary())) {
+                commanderNames.add(commander.getName());
+            }
+            for (Card commander : deck.getSideboard()) {
+                if (!(commander.isCreature()
+                        || commander.isLegendary())) {
                     invalid.put("Commander", "For Freeform Commander, the commander must be a creature or be legendary. Yours was: " + commander.getName());
                     valid = false;
                 }
                 if (deck.getSideboard().size() == 2 && !commander.getAbilities().contains(PartnerAbility.getInstance())) {
-                    invalid.put("Commander", "Commander without Partner (" + commander.getName() + ')');
-                    valid = false;
+                    boolean partnersWith = false;
+                    for (Ability ability : commander.getAbilities()) {
+                        if (ability instanceof PartnerWithAbility
+                                && commanderNames.contains(((PartnerWithAbility) ability).getPartnerName())) {
+                            partnersWith = true;
+                            break;
+                        }
+                    }
+                    if (!partnersWith) {
+                        invalid.put("Commander", "Commander without Partner (" + commander.getName() + ')');
+                        valid = false;
+                    }
                 }
                 FilterMana commanderColor = commander.getColorIdentity();
                 if (commanderColor.isWhite()) {

Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/PennyDreadfulCommander.java

@@ -29,8 +29,10 @@ package mage.deck;
 
 import java.util.*;
 import java.util.Map.Entry;
+import mage.abilities.Ability;
 import mage.abilities.common.CanBeYourCommanderAbility;
 import mage.abilities.keyword.PartnerAbility;
+import mage.abilities.keyword.PartnerWithAbility;
 import mage.cards.Card;
 import mage.cards.ExpansionSet;
 import mage.cards.Sets;
@@ -98,6 +100,10 @@ public class PennyDreadfulCommander extends Constructed {
             invalid.put("Commander", "Sideboard must contain only the commander(s)");
             valid = false;
         } else {
+            Set<String> commanderNames = new HashSet<>();
+            for (Card commander : deck.getSideboard()) {
+                commanderNames.add(commander.getName());
+            }
             for (Card commander : deck.getSideboard()) {
                 if ((!commander.isCreature() || !commander.isLegendary())
                         && (!commander.isPlaneswalker() || !commander.getAbilities().contains(CanBeYourCommanderAbility.getInstance()))) {
@@ -105,8 +111,18 @@ public class PennyDreadfulCommander extends Constructed {
                     valid = false;
                 }
                 if (deck.getSideboard().size() == 2 && !commander.getAbilities().contains(PartnerAbility.getInstance())) {
-                    invalid.put("Commander", "Commander without Partner (" + commander.getName() + ')');
-                    valid = false;
+                    boolean partnersWith = false;
+                    for (Ability ability : commander.getAbilities()) {
+                        if (ability instanceof PartnerWithAbility
+                                && commanderNames.contains(((PartnerWithAbility) ability).getPartnerName())) {
+                            partnersWith = true;
+                            break;
+                        }
+                    }
+                    if (!partnersWith) {
+                        invalid.put("Commander", "Commander without Partner (" + commander.getName() + ')');
+                        valid = false;
+                    }
                 }
                 FilterMana commanderColor = commander.getColorIdentity();
                 if (commanderColor.isWhite()) {

Mage.Server.Plugins/Mage.Deck.Limited/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.29</version>
+        <version>1.4.30</version>
     </parent>
 
     <artifactId>mage-deck-limited</artifactId>

Mage.Server.Plugins/Mage.Game.BrawlDuel/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.29</version>
+        <version>1.4.30</version>
     </parent>
 
     <artifactId>mage-game-brawlduel</artifactId>

Mage.Server.Plugins/Mage.Game.BrawlFreeForAll/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.mage</groupId>
     <artifactId>mage-server-plugins</artifactId>
-    <version>1.4.29</version>
+    <version>1.4.30</version>
   </parent>
 
     <artifactId>mage-game-brawlfreeforall</artifactId>

Mage.Server.Plugins/Mage.Game.CanadianHighlanderDuel/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.29</version>
+        <version>1.4.30</version>
     </parent>
 
     <artifactId>mage-game-canadianhighlanderduel</artifactId>

Mage.Server.Plugins/Mage.Game.CommanderDuel/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.29</version>
+        <version>1.4.30</version>
     </parent>
 
     <artifactId>mage-game-commanderduel</artifactId>

Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.mage</groupId>
     <artifactId>mage-server-plugins</artifactId>
-    <version>1.4.29</version>
+    <version>1.4.30</version>
   </parent>
 
     <artifactId>mage-game-commanderfreeforall</artifactId>

Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.29</version>
+        <version>1.4.30</version>
     </parent>
 
     <artifactId>mage-game-freeforall</artifactId>

Mage.Server.Plugins/Mage.Game.FreeformCommanderFreeForAll/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.mage</groupId>
     <artifactId>mage-server-plugins</artifactId>
-    <version>1.4.29</version>
+    <version>1.4.30</version>
   </parent>
 
     <artifactId>mage-game-freeformcommanderfreeforall</artifactId>

Mage.Server.Plugins/Mage.Game.MomirDuel/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.29</version>
+        <version>1.4.30</version>
     </parent>
     
     <artifactId>mage-game-momirduel</artifactId>

Mage.Server.Plugins/Mage.Game.MomirGame/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.29</version>
+        <version>1.4.30</version>
     </parent>
     
     <artifactId>mage-game-momirfreeforall</artifactId>

Mage.Server.Plugins/Mage.Game.PennyDreadfulCommanderFreeForAll/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.mage</groupId>
     <artifactId>mage-server-plugins</artifactId>
-    <version>1.4.29</version>
+    <version>1.4.30</version>
   </parent>
 
     <artifactId>mage-game-pennydreadfulcommanderfreeforall</artifactId>

Mage.Server.Plugins/Mage.Game.TinyLeadersDuel/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.29</version>
+        <version>1.4.30</version>
     </parent>
     
     <artifactId>mage-game-tinyleadersduel</artifactId>

Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.29</version>
+        <version>1.4.30</version>
     </parent>
 
     <artifactId>mage-game-twoplayerduel</artifactId>

Mage.Server.Plugins/Mage.Player.AI.DraftBot/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.29</version>
+        <version>1.4.30</version>
     </parent>
 
     <artifactId>mage-player-ai-draftbot</artifactId>

Mage.Server.Plugins/Mage.Player.AI.MA/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.29</version>
+        <version>1.4.30</version>
     </parent>
 
     <artifactId>mage-player-ai-ma</artifactId>

Mage.Server.Plugins/Mage.Player.AI/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.29</version>
+        <version>1.4.30</version>
     </parent>
 
     <artifactId>mage-player-ai</artifactId>

Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java

@@ -33,6 +33,7 @@ import java.util.*;
 import java.util.Map.Entry;
 import mage.ConditionalMana;
 import mage.MageObject;
+import mage.MageObjectReference;
 import mage.Mana;
 import mage.abilities.*;
 import mage.abilities.costs.VariableCost;
@@ -1027,7 +1028,7 @@ public class ComputerPlayer extends PlayerImpl implements Player {
                     findPlayables(game);
                     if (!playableAbilities.isEmpty()) {
                         for (ActivatedAbility ability : playableAbilities) {
-                            if (ability.canActivate(playerId, game)) {
+                            if (ability.canActivate(playerId, game).canActivate()) {
                                 if (ability.getEffects().hasOutcome(Outcome.PutLandInPlay)) {
                                     if (this.activateAbility(ability, game)) {
                                         return true;
@@ -1058,7 +1059,7 @@ public class ComputerPlayer extends PlayerImpl implements Player {
                     if (game.getStack().isEmpty()) {
                         if (!playableNonInstant.isEmpty()) {
                             for (Card card : playableNonInstant) {
-                                if (card.getSpellAbility().canActivate(playerId, game)) {
+                                if (card.getSpellAbility().canActivate(playerId, game).canActivate()) {
                                     if (this.activateAbility(card.getSpellAbility(), game)) {
                                         return true;
                                     }
@@ -1067,7 +1068,7 @@ public class ComputerPlayer extends PlayerImpl implements Player {
                         }
                         if (!playableAbilities.isEmpty()) {
                             for (ActivatedAbility ability : playableAbilities) {
-                                if (ability.canActivate(playerId, game)) {
+                                if (ability.canActivate(playerId, game).canActivate()) {
                                     if (!(ability.getEffects().get(0) instanceof BecomesCreatureSourceEffect)) {
                                         if (this.activateAbility(ability, game)) {
                                             return true;
@@ -1187,7 +1188,7 @@ public class ComputerPlayer extends PlayerImpl implements Player {
                 for (Mana avail : available) {
                     if (mana.enough(avail)) {
                         SpellAbility ability = card.getSpellAbility();
-                        if (ability != null && ability.canActivate(playerId, game)
+                        if (ability != null && ability.canActivate(playerId, game).canActivate()
                                 && game.getContinuousEffects().preventedByRuleModification(GameEvent.getEvent(GameEvent.EventType.CAST_SPELL, ability.getSourceId(), ability.getSourceId(), playerId), ability, game, true)) {
                             if (card.getCardType().contains(CardType.INSTANT)
                                     || card.hasAbility(FlashAbility.getInstance().getId(), game)) {
@@ -1204,7 +1205,7 @@ public class ComputerPlayer extends PlayerImpl implements Player {
         }
         for (Permanent permanent : game.getBattlefield().getAllActivePermanents(playerId)) {
             for (ActivatedAbility ability : permanent.getAbilities().getActivatedAbilities(Zone.BATTLEFIELD)) {
-                if (!(ability instanceof ActivatedManaAbilityImpl) && ability.canActivate(playerId, game)) {
+                if (!(ability instanceof ActivatedManaAbilityImpl) && ability.canActivate(playerId, game).canActivate()) {
                     if (ability instanceof EquipAbility && permanent.getAttachedTo() != null) {
                         continue;
                     }
@@ -1231,7 +1232,7 @@ public class ComputerPlayer extends PlayerImpl implements Player {
         }
         for (Card card : graveyard.getCards(game)) {
             for (ActivatedAbility ability : card.getAbilities().getActivatedAbilities(Zone.GRAVEYARD)) {
-                if (ability.canActivate(playerId, game)) {
+                if (ability.canActivate(playerId, game).canActivate()) {
                     ManaOptions abilityOptions = ability.getManaCosts().getOptions();
                     if (abilityOptions.isEmpty()) {
                         playableAbilities.add(ability);
@@ -1264,7 +1265,7 @@ public class ComputerPlayer extends PlayerImpl implements Player {
 
     protected boolean playManaHandling(Ability ability, ManaCost unpaid, final Game game) {
 //        log.info("paying for " + unpaid.getText());
-        UUID spendAnyManaId = game.getContinuousEffects().asThough(ability.getSourceId(), AsThoughEffectType.SPEND_OTHER_MANA, ability, ability.getControllerId(), game);
+        MageObjectReference permittingObject = game.getContinuousEffects().asThough(ability.getSourceId(), AsThoughEffectType.SPEND_OTHER_MANA, ability, ability.getControllerId(), game);
         ManaCost cost;
         List<MageObject> producers;
         if (unpaid instanceof ManaCosts) {
@@ -1308,7 +1309,7 @@ public class ComputerPlayer extends PlayerImpl implements Player {
             for (ActivatedManaAbilityImpl manaAbility : getManaAbilitiesSortedByManaCount(mageObject, game)) {
                 if (cost instanceof ColoredManaCost) {
                     for (Mana netMana : manaAbility.getNetMana(game)) {
-                        if (cost.testPay(netMana) || spendAnyManaId != null) {
+                        if (cost.testPay(netMana) || permittingObject != null) {
                             if (netMana instanceof ConditionalMana && !((ConditionalMana) netMana).apply(ability, game, getId(), cost)) {
                                 continue;
                             }
@@ -1323,7 +1324,7 @@ public class ComputerPlayer extends PlayerImpl implements Player {
             for (ActivatedManaAbilityImpl manaAbility : getManaAbilitiesSortedByManaCount(mageObject, game)) {
                 if (cost instanceof SnowManaCost) {
                     for (Mana netMana : manaAbility.getNetMana(game)) {
-                        if (cost.testPay(netMana) || spendAnyManaId != null) {
+                        if (cost.testPay(netMana) || permittingObject != null) {
                             if (netMana instanceof ConditionalMana && !((ConditionalMana) netMana).apply(ability, game, getId(), cost)) {
                                 continue;
                             }
@@ -1338,7 +1339,7 @@ public class ComputerPlayer extends PlayerImpl implements Player {
             for (ActivatedManaAbilityImpl manaAbility : getManaAbilitiesSortedByManaCount(mageObject, game)) {
                 if (cost instanceof HybridManaCost) {
                     for (Mana netMana : manaAbility.getNetMana(game)) {
-                        if (cost.testPay(netMana) || spendAnyManaId != null) {
+                        if (cost.testPay(netMana) || permittingObject != null) {
                             if (netMana instanceof ConditionalMana && !((ConditionalMana) netMana).apply(ability, game, getId(), cost)) {
                                 continue;
                             }
@@ -1353,7 +1354,7 @@ public class ComputerPlayer extends PlayerImpl implements Player {
             for (ActivatedManaAbilityImpl manaAbility : getManaAbilitiesSortedByManaCount(mageObject, game)) {
                 if (cost instanceof MonoHybridManaCost) {
                     for (Mana netMana : manaAbility.getNetMana(game)) {
-                        if (cost.testPay(netMana) || spendAnyManaId != null) {
+                        if (cost.testPay(netMana) || permittingObject != null) {
                             if (netMana instanceof ConditionalMana && !((ConditionalMana) netMana).apply(ability, game, getId(), cost)) {
                                 continue;
                             }
@@ -1368,7 +1369,7 @@ public class ComputerPlayer extends PlayerImpl implements Player {
             for (ActivatedManaAbilityImpl manaAbility : getManaAbilitiesSortedByManaCount(mageObject, game)) {
                 if (cost instanceof ColorlessManaCost) {
                     for (Mana netMana : manaAbility.getNetMana(game)) {
-                        if (cost.testPay(netMana) || spendAnyManaId != null) {
+                        if (cost.testPay(netMana) || permittingObject != null) {
                             if (netMana instanceof ConditionalMana && !((ConditionalMana) netMana).apply(ability, game, getId(), cost)) {
                                 continue;
                             }
@@ -1383,7 +1384,7 @@ public class ComputerPlayer extends PlayerImpl implements Player {
             for (ActivatedManaAbilityImpl manaAbility : getManaAbilitiesSortedByManaCount(mageObject, game)) {
                 if (cost instanceof GenericManaCost) {
                     for (Mana netMana : manaAbility.getNetMana(game)) {
-                        if (cost.testPay(netMana) || spendAnyManaId != null) {
+                        if (cost.testPay(netMana) || permittingObject != null) {
                             if (netMana instanceof ConditionalMana && !((ConditionalMana) netMana).apply(ability, game, getId(), cost)) {
                                 continue;
                             }
@@ -1397,7 +1398,7 @@ public class ComputerPlayer extends PlayerImpl implements Player {
         }
         // pay phyrexian life costs
         if (cost instanceof PhyrexianManaCost) {
-            if (cost.pay(null, game, null, playerId, false, null) || spendAnyManaId != null) {
+            if (cost.pay(null, game, null, playerId, false, null) || permittingObject != null) {
                 return true;
             }
         }
@@ -2386,7 +2387,7 @@ public class ComputerPlayer extends PlayerImpl implements Player {
     private void playRemoval(List<UUID> creatures, Game game) {
         for (UUID creatureId : creatures) {
             for (Card card : this.playableInstant) {
-                if (card.getSpellAbility().canActivate(playerId, game)) {
+                if (card.getSpellAbility().canActivate(playerId, game).canActivate()) {
                     for (Effect effect : card.getSpellAbility().getEffects()) {
                         if (effect.getOutcome() == Outcome.DestroyPermanent || effect.getOutcome() == Outcome.ReturnToHand) {
                             if (card.getSpellAbility().getTargets().get(0).canTarget(creatureId, card.getSpellAbility(), game)) {
@@ -2405,7 +2406,7 @@ public class ComputerPlayer extends PlayerImpl implements Player {
         for (UUID creatureId : creatures) {
             Permanent creature = game.getPermanent(creatureId);
             for (Card card : this.playableInstant) {
-                if (card.getSpellAbility().canActivate(playerId, game)) {
+                if (card.getSpellAbility().canActivate(playerId, game).canActivate()) {
                     for (Effect effect : card.getSpellAbility().getEffects()) {
                         if (effect instanceof DamageTargetEffect) {
                             if (card.getSpellAbility().getTargets().get(0).canTarget(creatureId, card.getSpellAbility(), game)) {

Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.29</version>
+        <version>1.4.30</version>
     </parent>
 
     <artifactId>mage-player-ai-mcts</artifactId>

Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.29</version>
+        <version>1.4.30</version>
     </parent>
 
     <artifactId>mage-player-aiminimax</artifactId>

Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/GameStateEvaluator.java

@@ -25,17 +25,16 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-
 package mage.player.ai;
 
 import java.util.UUID;
-import mage.constants.CardType;
-import mage.constants.Zone;
 import mage.abilities.ActivatedAbility;
 import mage.abilities.keyword.DoubleStrikeAbility;
 import mage.abilities.keyword.FirstStrikeAbility;
 import mage.abilities.keyword.TrampleAbility;
 import mage.abilities.mana.ActivatedManaAbilityImpl;
+import mage.constants.CardType;
+import mage.constants.Zone;
 import mage.counters.BoostCounter;
 import mage.counters.Counter;
 import mage.counters.CounterType;
@@ -71,18 +70,20 @@ public final class GameStateEvaluator {
         Player player = game.getPlayer(playerId);
         Player opponent = game.getPlayer(game.getOpponents(playerId).iterator().next());
         if (game.checkIfGameIsOver()) {
-            if (player.hasLost() || opponent.hasWon())
+            if (player.hasLost() || opponent.hasWon()) {
                 return LOSE_SCORE;
-            if (opponent.hasLost() || player.hasWon())
+            }
+            if (opponent.hasLost() || player.hasWon()) {
                 return WIN_SCORE;
+            }
         }
         int lifeScore = (player.getLife() - opponent.getLife()) * LIFE_FACTOR;
         int poisonScore = (opponent.getCounters().getCount(CounterType.POISON) - player.getCounters().getCount(CounterType.POISON)) * LIFE_FACTOR * 2;
         int permanentScore = 0;
-        for (Permanent permanent: game.getBattlefield().getAllActivePermanents(playerId)) {
+        for (Permanent permanent : game.getBattlefield().getAllActivePermanents(playerId)) {
             permanentScore += evaluatePermanent(permanent, game, ignoreTapped);
         }
-        for (Permanent permanent: game.getBattlefield().getAllActivePermanents(opponent.getId())) {
+        for (Permanent permanent : game.getBattlefield().getAllActivePermanents(opponent.getId())) {
             permanentScore -= evaluatePermanent(permanent, game, ignoreTapped);
         }
         permanentScore *= PERMANENT_FACTOR;
@@ -92,26 +93,29 @@ public final class GameStateEvaluator {
         handScore *= HAND_FACTOR;
 
         int score = lifeScore + poisonScore + permanentScore + handScore;
-        if (logger.isDebugEnabled())
+        if (logger.isDebugEnabled()) {
             logger.debug("game state for player " + player.getName() + " evaluated to- lifeScore:" + lifeScore + " permanentScore:" + permanentScore + " handScore:" + handScore + " total:" + score);
+        }
         return score;
     }
 
     public static int evaluatePermanent(Permanent permanent, Game game, boolean ignoreTapped) {
         int value = 0;
-        if (ignoreTapped)
+        if (ignoreTapped) {
             value = 5;
-        else
-            value = permanent.isTapped()?4:5;
+        } else {
+            value = permanent.isTapped() ? 4 : 5;
+        }
         if (permanent.getCardType().contains(CardType.CREATURE)) {
             value += evaluateCreature(permanent, game) * CREATURE_FACTOR;
         }
         value += permanent.getAbilities().getActivatedManaAbilities(Zone.BATTLEFIELD).size();
-        for (ActivatedAbility ability: permanent.getAbilities().getActivatedAbilities(Zone.BATTLEFIELD)) {
-            if (!(ability instanceof ActivatedManaAbilityImpl) && ability.canActivate(ability.getControllerId(), game))
+        for (ActivatedAbility ability : permanent.getAbilities().getActivatedAbilities(Zone.BATTLEFIELD)) {
+            if (!(ability instanceof ActivatedManaAbilityImpl) && ability.canActivate(ability.getControllerId(), game).canActivate()) {
                 value += ability.getEffects().size();
+            }
         }
-        for (Counter counter: permanent.getCounters(game).values()) {
+        for (Counter counter : permanent.getCounters(game).values()) {
             if (!(counter instanceof BoostCounter)) {
                 value += counter.getCount();
             }
@@ -133,9 +137,9 @@ public final class GameStateEvaluator {
 //            value += 2;
         value += creature.getAbilities().getEvasionAbilities().size();
         value += creature.getAbilities().getProtectionAbilities().size();
-        value += creature.getAbilities().containsKey(FirstStrikeAbility.getInstance().getId())?1:0;
-        value += creature.getAbilities().containsKey(DoubleStrikeAbility.getInstance().getId())?2:0;
-        value += creature.getAbilities().containsKey(TrampleAbility.getInstance().getId())?1:0;
+        value += creature.getAbilities().containsKey(FirstStrikeAbility.getInstance().getId()) ? 1 : 0;
+        value += creature.getAbilities().containsKey(DoubleStrikeAbility.getInstance().getId()) ? 2 : 0;
+        value += creature.getAbilities().containsKey(TrampleAbility.getInstance().getId()) ? 1 : 0;
         return value;
     }
 

Mage.Server.Plugins/Mage.Player.Human/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.29</version>
+        <version>1.4.30</version>
     </parent>
 
     <artifactId>mage-player-human</artifactId>

Mage.Server.Plugins/Mage.Tournament.BoosterDraft/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.29</version>
+        <version>1.4.30</version>
     </parent>
 
     <artifactId>mage-tournament-boosterdraft</artifactId>

Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/AdamStyborskisPauperCube.java

@@ -37,15 +37,15 @@ public class AdamStyborskisPauperCube extends DraftCube {
 
     public AdamStyborskisPauperCube() {
         super("Adam Styborkski's Pauper Cube"); // https://docs.google.com/spreadsheets/d/12iQhC4bHqFW7hEWxPBjyC8yBDehFZ0_4DkqzyA8EL3o/edit#gid=0
-        // last updated with Hour of Devastation, Iconic Masters and Ixalan 10/18/17
+        // last updated with Dominaria 5/1/18
+        cubeCards.add(new CardIdentity("Academy Journeymage", ""));
         cubeCards.add(new CardIdentity("Act of Treason", ""));
         cubeCards.add(new CardIdentity("Adventuring Gear", ""));
+        cubeCards.add(new CardIdentity("Aerie Bowmasters", ""));
         cubeCards.add(new CardIdentity("Aerie Ouphes", ""));
         cubeCards.add(new CardIdentity("Aether Adept", ""));
         cubeCards.add(new CardIdentity("Aethersnipe", ""));
         cubeCards.add(new CardIdentity("Agony Warp", ""));
-        cubeCards.add(new CardIdentity("Aim High", ""));
-        cubeCards.add(new CardIdentity("Ambuscade", ""));
         cubeCards.add(new CardIdentity("Ambush Viper", ""));
         cubeCards.add(new CardIdentity("Angelic Purge", ""));
         cubeCards.add(new CardIdentity("Arachnus Web", ""));
@@ -61,7 +61,7 @@ public class AdamStyborskisPauperCube extends DraftCube {
         cubeCards.add(new CardIdentity("Aven Riftwatcher", ""));
         cubeCards.add(new CardIdentity("Aven Surveyor", ""));
         cubeCards.add(new CardIdentity("Azorius Guildgate", ""));
-        cubeCards.add(new CardIdentity("Baleful Eidolon", ""));
+        cubeCards.add(new CardIdentity("Baloth Gorger", ""));
         cubeCards.add(new CardIdentity("Barbed Lightning", ""));
         cubeCards.add(new CardIdentity("Basking Rootwalla", ""));
         cubeCards.add(new CardIdentity("Battle Screech", ""));
@@ -72,33 +72,31 @@ public class AdamStyborskisPauperCube extends DraftCube {
         cubeCards.add(new CardIdentity("Blazing Torch", ""));
         cubeCards.add(new CardIdentity("Blightning", ""));
         cubeCards.add(new CardIdentity("Blinding Beam", ""));
+        cubeCards.add(new CardIdentity("Blink of an Eye", ""));
         cubeCards.add(new CardIdentity("Bloodfell Caves", ""));
         cubeCards.add(new CardIdentity("Blossoming Sands", ""));
         cubeCards.add(new CardIdentity("Bonded Construct", ""));
         cubeCards.add(new CardIdentity("Bonds of Faith", ""));
         cubeCards.add(new CardIdentity("Bonesplitter", ""));
-        cubeCards.add(new CardIdentity("Borderland Marauder", ""));
         cubeCards.add(new CardIdentity("Boros Guildgate", ""));
         cubeCards.add(new CardIdentity("Borrowed Grace", ""));
         cubeCards.add(new CardIdentity("Branching Bolt", ""));
-        cubeCards.add(new CardIdentity("Brazen Buccaneers", ""));
         cubeCards.add(new CardIdentity("Brazen Wolves", ""));
         cubeCards.add(new CardIdentity("Burning-Tree Emissary", ""));
         cubeCards.add(new CardIdentity("Burst Lightning", ""));
         cubeCards.add(new CardIdentity("Butcher Ghoul", ""));
-        cubeCards.add(new CardIdentity("Byway Courier", ""));
         cubeCards.add(new CardIdentity("Cage of Hands", ""));
         cubeCards.add(new CardIdentity("Calcite Snapper", ""));
         cubeCards.add(new CardIdentity("Call of the Conclave", ""));
+        cubeCards.add(new CardIdentity("Call the Cavalry", ""));
         cubeCards.add(new CardIdentity("Capsize", ""));
         cubeCards.add(new CardIdentity("Carnivorous Death-Parrot", ""));
         cubeCards.add(new CardIdentity("Cartouche of Strength", ""));
-        cubeCards.add(new CardIdentity("Cathodion", ""));
         cubeCards.add(new CardIdentity("Cavern Harpy", ""));
         cubeCards.add(new CardIdentity("Centaur Healer", ""));
         cubeCards.add(new CardIdentity("Chain Lightning", ""));
         cubeCards.add(new CardIdentity("Chainer's Edict", ""));
-        cubeCards.add(new CardIdentity("Chatter of the Squirrel", ""));
+        cubeCards.add(new CardIdentity("Chivalrous Chevalier", ""));
         cubeCards.add(new CardIdentity("Cinder Barrens", ""));
         cubeCards.add(new CardIdentity("Citanul Woodreaders", ""));
         cubeCards.add(new CardIdentity("Claustrophobia", ""));
@@ -108,13 +106,14 @@ public class AdamStyborskisPauperCube extends DraftCube {
         cubeCards.add(new CardIdentity("Coalition Honor Guard", ""));
         cubeCards.add(new CardIdentity("Cogwork Librarian", ""));
         cubeCards.add(new CardIdentity("Colossal Might", ""));
+        cubeCards.add(new CardIdentity("Common Iguana", ""));
         cubeCards.add(new CardIdentity("Compulsive Research", ""));
         cubeCards.add(new CardIdentity("Compulsory Rest", ""));
         cubeCards.add(new CardIdentity("Consume Strength", ""));
         cubeCards.add(new CardIdentity("Corrupted Zendikon", ""));
         cubeCards.add(new CardIdentity("Counterspell", ""));
+        cubeCards.add(new CardIdentity("Court Hussar", ""));
         cubeCards.add(new CardIdentity("Crippling Fatigue", ""));
-        cubeCards.add(new CardIdentity("Crow of Dark Tidings", ""));
         cubeCards.add(new CardIdentity("Crypt Rats", ""));
         cubeCards.add(new CardIdentity("Crystallization", ""));
         cubeCards.add(new CardIdentity("Cunning Strike", ""));
@@ -126,24 +125,23 @@ public class AdamStyborskisPauperCube extends DraftCube {
         cubeCards.add(new CardIdentity("Dead Weight", ""));
         cubeCards.add(new CardIdentity("Deadeye Tormentor", ""));
         cubeCards.add(new CardIdentity("Death Denied", ""));
+        cubeCards.add(new CardIdentity("Deathbloom Thallid", ""));
         cubeCards.add(new CardIdentity("Deep Analysis", ""));
         cubeCards.add(new CardIdentity("Deprive", ""));
         cubeCards.add(new CardIdentity("Depths of Desire", ""));
         cubeCards.add(new CardIdentity("Deputy of Acquittals", ""));
         cubeCards.add(new CardIdentity("Desert", ""));
-        cubeCards.add(new CardIdentity("Desperate Sentry", ""));
         cubeCards.add(new CardIdentity("Devour Flesh", ""));
         cubeCards.add(new CardIdentity("Diabolic Edict", ""));
         cubeCards.add(new CardIdentity("Dimir Guildgate", ""));
         cubeCards.add(new CardIdentity("Dinrova Horror", ""));
-        cubeCards.add(new CardIdentity("Dire Fleet Hoarder", ""));
         cubeCards.add(new CardIdentity("Disfigure", ""));
         cubeCards.add(new CardIdentity("Dismal Backwater", ""));
         cubeCards.add(new CardIdentity("Disowned Ancestor", ""));
         cubeCards.add(new CardIdentity("Doom Blade", ""));
         cubeCards.add(new CardIdentity("Doomed Traveler", ""));
-        cubeCards.add(new CardIdentity("Drag Under", ""));
         cubeCards.add(new CardIdentity("Dragon Fodder", ""));
+        cubeCards.add(new CardIdentity("Dusk Legion Zealot", ""));
         cubeCards.add(new CardIdentity("Dynacharge", ""));
         cubeCards.add(new CardIdentity("Eager Construct", ""));
         cubeCards.add(new CardIdentity("Eldrazi Devastator", ""));
@@ -154,12 +152,13 @@ public class AdamStyborskisPauperCube extends DraftCube {
         cubeCards.add(new CardIdentity("Emperor Crocodile", ""));
         cubeCards.add(new CardIdentity("Epic Confrontation", ""));
         cubeCards.add(new CardIdentity("Errant Ephemeron", ""));
-        cubeCards.add(new CardIdentity("Esper Cormorants", ""));
         cubeCards.add(new CardIdentity("Evincar's Justice", ""));
         cubeCards.add(new CardIdentity("Evolving Wilds", ""));
+        cubeCards.add(new CardIdentity("Extremely Slow Zombie (C)", ""));
         cubeCards.add(new CardIdentity("Faceless Butcher", ""));
         cubeCards.add(new CardIdentity("Faith's Fetters", ""));
         cubeCards.add(new CardIdentity("Falkenrath Noble", ""));
+        cubeCards.add(new CardIdentity("Fanatical Firebrand", ""));
         cubeCards.add(new CardIdentity("Feeling of Dread", ""));
         cubeCards.add(new CardIdentity("Fervent Cathar", ""));
         cubeCards.add(new CardIdentity("Firebolt", ""));
@@ -170,25 +169,27 @@ public class AdamStyborskisPauperCube extends DraftCube {
         cubeCards.add(new CardIdentity("Forsaken Sanctuary", ""));
         cubeCards.add(new CardIdentity("Fortify", ""));
         cubeCards.add(new CardIdentity("Foul Orchard", ""));
+        cubeCards.add(new CardIdentity("Frenzied Goblin", ""));
+        cubeCards.add(new CardIdentity("Frilled Deathspitter", ""));
         cubeCards.add(new CardIdentity("Frilled Oculus", ""));
         cubeCards.add(new CardIdentity("Frostburn Weird", ""));
+        cubeCards.add(new CardIdentity("Fungal Infection", ""));
+        cubeCards.add(new CardIdentity("GO TO JAIL", ""));
         cubeCards.add(new CardIdentity("Gathan Raiders", ""));
         cubeCards.add(new CardIdentity("Gather the Townsfolk", ""));
-        cubeCards.add(new CardIdentity("Ghastly Demise", ""));
         cubeCards.add(new CardIdentity("Ghirapur Gearcrafter", ""));
-        cubeCards.add(new CardIdentity("Ghitu Slinger", ""));
         cubeCards.add(new CardIdentity("Giant Growth", ""));
         cubeCards.add(new CardIdentity("Gideon's Lawkeeper", ""));
         cubeCards.add(new CardIdentity("Glint-Sleeve Artisan", ""));
         cubeCards.add(new CardIdentity("Gnawing Zombie", ""));
         cubeCards.add(new CardIdentity("Goblin Freerunner", ""));
         cubeCards.add(new CardIdentity("Goblin Heelcutter", ""));
+        cubeCards.add(new CardIdentity("Goblin Trailblazer", ""));
         cubeCards.add(new CardIdentity("Gods Willing", ""));
         cubeCards.add(new CardIdentity("Goldmeadow Harrier", ""));
         cubeCards.add(new CardIdentity("Golgari Guildgate", ""));
         cubeCards.add(new CardIdentity("Gravedigger", ""));
         cubeCards.add(new CardIdentity("Gray Merchant of Asphodel", ""));
-        cubeCards.add(new CardIdentity("Grazing Whiptail", ""));
         cubeCards.add(new CardIdentity("Grim Contest", ""));
         cubeCards.add(new CardIdentity("Grisly Salvage", ""));
         cubeCards.add(new CardIdentity("Grixis Slavedriver", ""));
@@ -204,9 +205,8 @@ public class AdamStyborskisPauperCube extends DraftCube {
         cubeCards.add(new CardIdentity("Highland Lake", ""));
         cubeCards.add(new CardIdentity("Hissing Iguanar", ""));
         cubeCards.add(new CardIdentity("Hooting Mandrills", ""));
-        cubeCards.add(new CardIdentity("Humble", ""));
+        cubeCards.add(new CardIdentity("Hordeling Outburst", ""));
         cubeCards.add(new CardIdentity("Imperiosaur", ""));
-        cubeCards.add(new CardIdentity("Incinerate", ""));
         cubeCards.add(new CardIdentity("Inner-Flame Acolyte", ""));
         cubeCards.add(new CardIdentity("Insolent Neonate", ""));
         cubeCards.add(new CardIdentity("Into the Roil", ""));
@@ -214,17 +214,20 @@ public class AdamStyborskisPauperCube extends DraftCube {
         cubeCards.add(new CardIdentity("Ivy Elemental", ""));
         cubeCards.add(new CardIdentity("Izzet Chronarch", ""));
         cubeCards.add(new CardIdentity("Izzet Guildgate", ""));
+        cubeCards.add(new CardIdentity("Jackal Pup", ""));
         cubeCards.add(new CardIdentity("Jilt", ""));
         cubeCards.add(new CardIdentity("Journey to Nowhere", ""));
         cubeCards.add(new CardIdentity("Jungle Hollow", ""));
-        cubeCards.add(new CardIdentity("Kabuto Moth", ""));
+        cubeCards.add(new CardIdentity("Jungleborn Pioneer", ""));
         cubeCards.add(new CardIdentity("Keldon Marauders", ""));
+        cubeCards.add(new CardIdentity("Keldon Overseer", ""));
+        cubeCards.add(new CardIdentity("Keldon Raider", ""));
         cubeCards.add(new CardIdentity("Kingpin's Pet", ""));
+        cubeCards.add(new CardIdentity("Kitesail Corsair", ""));
         cubeCards.add(new CardIdentity("Kor Skyfisher", ""));
         cubeCards.add(new CardIdentity("Kozilek's Channeler", ""));
         cubeCards.add(new CardIdentity("Krenko's Command", ""));
         cubeCards.add(new CardIdentity("Krosan Tusker", ""));
-        cubeCards.add(new CardIdentity("Kruin Striker", ""));
         cubeCards.add(new CardIdentity("Lash Out", ""));
         cubeCards.add(new CardIdentity("Last Gasp", ""));
         cubeCards.add(new CardIdentity("Leave in the Dust", ""));
@@ -232,16 +235,15 @@ public class AdamStyborskisPauperCube extends DraftCube {
         cubeCards.add(new CardIdentity("Lifecraft Cavalry", ""));
         cubeCards.add(new CardIdentity("Lightning Bolt", ""));
         cubeCards.add(new CardIdentity("Liliana's Specter", ""));
-        cubeCards.add(new CardIdentity("Lotus Path Djinn", ""));
         cubeCards.add(new CardIdentity("Loyal Pegasus", ""));
         cubeCards.add(new CardIdentity("Lurking Automaton", ""));
         cubeCards.add(new CardIdentity("Magma Jet", ""));
         cubeCards.add(new CardIdentity("Makeshift Mauler", ""));
         cubeCards.add(new CardIdentity("Man-o'-War", ""));
         cubeCards.add(new CardIdentity("Mana Leak", ""));
-        cubeCards.add(new CardIdentity("Manticore of the Gauntlet", ""));
         cubeCards.add(new CardIdentity("Mardu Hordechief", ""));
         cubeCards.add(new CardIdentity("Mardu Skullhunter", ""));
+        cubeCards.add(new CardIdentity("Martyr of Dusk", ""));
         cubeCards.add(new CardIdentity("Maul Splicer", ""));
         cubeCards.add(new CardIdentity("Maze of Ith", ""));
         cubeCards.add(new CardIdentity("Meandering River", ""));
@@ -263,7 +265,6 @@ public class AdamStyborskisPauperCube extends DraftCube {
         cubeCards.add(new CardIdentity("Mulldrifter", ""));
         cubeCards.add(new CardIdentity("Nameless Inversion", ""));
         cubeCards.add(new CardIdentity("Narcolepsy", ""));
-        cubeCards.add(new CardIdentity("Necromancer's Assistant", ""));
         cubeCards.add(new CardIdentity("Nessian Asp", ""));
         cubeCards.add(new CardIdentity("Nest Robber", ""));
         cubeCards.add(new CardIdentity("Nezumi Cutthroat", ""));
@@ -272,25 +273,22 @@ public class AdamStyborskisPauperCube extends DraftCube {
         cubeCards.add(new CardIdentity("Ninja of the Deep Hours", ""));
         cubeCards.add(new CardIdentity("Oblivion Ring", ""));
         cubeCards.add(new CardIdentity("Oona's Grace", ""));
+        cubeCards.add(new CardIdentity("Ordinary Pony", ""));
         cubeCards.add(new CardIdentity("Orzhov Guildgate", ""));
         cubeCards.add(new CardIdentity("Otherworldly Journey", ""));
+        cubeCards.add(new CardIdentity("Overgrown Armasaur", ""));
         cubeCards.add(new CardIdentity("Pacifism", ""));
         cubeCards.add(new CardIdentity("Paladin of the Bloodstained", ""));
         cubeCards.add(new CardIdentity("Peema Outrider", ""));
         cubeCards.add(new CardIdentity("Penumbra Spider", ""));
-        cubeCards.add(new CardIdentity("Peregrine Drake", ""));
         cubeCards.add(new CardIdentity("Perilous Myr", ""));
         cubeCards.add(new CardIdentity("Pestermite", ""));
         cubeCards.add(new CardIdentity("Pestilence", ""));
-        cubeCards.add(new CardIdentity("Phantom Nomad", ""));
-        cubeCards.add(new CardIdentity("Phantom Tiger", ""));
-        cubeCards.add(new CardIdentity("Pharika's Chosen", ""));
         cubeCards.add(new CardIdentity("Phyrexian Rager", ""));
         cubeCards.add(new CardIdentity("Pillory of the Sleepless", ""));
         cubeCards.add(new CardIdentity("Pit Fight", ""));
         cubeCards.add(new CardIdentity("Pit Keeper", ""));
         cubeCards.add(new CardIdentity("Plated Geopede", ""));
-        cubeCards.add(new CardIdentity("Plover Knights", ""));
         cubeCards.add(new CardIdentity("Porcelain Legionnaire", ""));
         cubeCards.add(new CardIdentity("Pounce", ""));
         cubeCards.add(new CardIdentity("Predatory Nightstalker", ""));
@@ -321,16 +319,18 @@ public class AdamStyborskisPauperCube extends DraftCube {
         cubeCards.add(new CardIdentity("Renegade Freighter", ""));
         cubeCards.add(new CardIdentity("Rift Bolt", ""));
         cubeCards.add(new CardIdentity("Rishadan Airship", ""));
-        cubeCards.add(new CardIdentity("Ronin Houndmaster", ""));
         cubeCards.add(new CardIdentity("Rugged Highlands", ""));
         cubeCards.add(new CardIdentity("Runed Servitor", ""));
         cubeCards.add(new CardIdentity("Rushing River", ""));
+        cubeCards.add(new CardIdentity("Ruthless Ripper", ""));
         cubeCards.add(new CardIdentity("Sailor of Means", ""));
         cubeCards.add(new CardIdentity("Sakura-Tribe Elder", ""));
         cubeCards.add(new CardIdentity("Sandsteppe Outcast", ""));
         cubeCards.add(new CardIdentity("Sangrite Backlash", ""));
+        cubeCards.add(new CardIdentity("Saproling Migration", ""));
         cubeCards.add(new CardIdentity("Sarkhan's Rage", ""));
         cubeCards.add(new CardIdentity("Savage Punch", ""));
+        cubeCards.add(new CardIdentity("Savannah Lions", ""));
         cubeCards.add(new CardIdentity("Scatter the Seeds", ""));
         cubeCards.add(new CardIdentity("Scion Summoner", ""));
         cubeCards.add(new CardIdentity("Scion of the Wild", ""));
@@ -343,9 +343,10 @@ public class AdamStyborskisPauperCube extends DraftCube {
         cubeCards.add(new CardIdentity("Seeker of Insight", ""));
         cubeCards.add(new CardIdentity("Seeker of the Way", ""));
         cubeCards.add(new CardIdentity("Selesnya Guildgate", ""));
-        cubeCards.add(new CardIdentity("Sentinel Spider", ""));
+        cubeCards.add(new CardIdentity("Selfie Preservation", ""));
         cubeCards.add(new CardIdentity("Separatist Voidmage", ""));
         cubeCards.add(new CardIdentity("Seraph of Dawn", ""));
+        cubeCards.add(new CardIdentity("Sergeant-at-Arms", ""));
         cubeCards.add(new CardIdentity("Serrated Arrows", ""));
         cubeCards.add(new CardIdentity("Shaper Parasite", ""));
         cubeCards.add(new CardIdentity("Sheer Drop", ""));
@@ -360,11 +361,12 @@ public class AdamStyborskisPauperCube extends DraftCube {
         cubeCards.add(new CardIdentity("Snakeform", ""));
         cubeCards.add(new CardIdentity("Snap", ""));
         cubeCards.add(new CardIdentity("Soul Manipulation", ""));
+        cubeCards.add(new CardIdentity("Soul of the Rapids", ""));
         cubeCards.add(new CardIdentity("Soulstinger", ""));
+        cubeCards.add(new CardIdentity("Sparring Construct", ""));
         cubeCards.add(new CardIdentity("Sphere of the Suns", ""));
         cubeCards.add(new CardIdentity("Spike Jester", ""));
-        cubeCards.add(new CardIdentity("Spined Thopter", ""));
-        cubeCards.add(new CardIdentity("Splatter Thug", ""));
+        cubeCards.add(new CardIdentity("Squirrel Dealer", ""));
         cubeCards.add(new CardIdentity("Staggershock", ""));
         cubeCards.add(new CardIdentity("Star Compass", ""));
         cubeCards.add(new CardIdentity("Stitched Drake", ""));
@@ -372,20 +374,19 @@ public class AdamStyborskisPauperCube extends DraftCube {
         cubeCards.add(new CardIdentity("Storm Fleet Pyromancer", ""));
         cubeCards.add(new CardIdentity("Stormfront Pegasus", ""));
         cubeCards.add(new CardIdentity("Stormscape Apprentice", ""));
-        cubeCards.add(new CardIdentity("Strip Mine", ""));
+        cubeCards.add(new CardIdentity("Strip Min", ""));
         cubeCards.add(new CardIdentity("Striped Riverwinder", ""));
+        cubeCards.add(new CardIdentity("Stronghold Confessor", ""));
         cubeCards.add(new CardIdentity("Submerged Boneyard", ""));
         cubeCards.add(new CardIdentity("Sultai Scavenger", ""));
         cubeCards.add(new CardIdentity("Suppression Bonds", ""));
         cubeCards.add(new CardIdentity("Swiftwater Cliffs", ""));
         cubeCards.add(new CardIdentity("Sylvan Might", ""));
         cubeCards.add(new CardIdentity("Sylvok Lifestaff", ""));
-        cubeCards.add(new CardIdentity("Tah-Crop Elite", ""));
         cubeCards.add(new CardIdentity("Temporal Isolation", ""));
         cubeCards.add(new CardIdentity("Tenement Crasher", ""));
         cubeCards.add(new CardIdentity("Terminate", ""));
         cubeCards.add(new CardIdentity("Terramorphic Expanse", ""));
-        cubeCards.add(new CardIdentity("Test of Faith", ""));
         cubeCards.add(new CardIdentity("Thorn of the Black Rose", ""));
         cubeCards.add(new CardIdentity("Thornweald Archer", ""));
         cubeCards.add(new CardIdentity("Thornwood Falls", ""));
@@ -393,7 +394,6 @@ public class AdamStyborskisPauperCube extends DraftCube {
         cubeCards.add(new CardIdentity("Thraben Inspector", ""));
         cubeCards.add(new CardIdentity("Thrill-Kill Assassin", ""));
         cubeCards.add(new CardIdentity("Thundering Giant", ""));
-        cubeCards.add(new CardIdentity("Thundering Tanadon", ""));
         cubeCards.add(new CardIdentity("Thunderous Wrath", ""));
         cubeCards.add(new CardIdentity("Timber Gorge", ""));
         cubeCards.add(new CardIdentity("Time to Feed", ""));
@@ -408,7 +408,6 @@ public class AdamStyborskisPauperCube extends DraftCube {
         cubeCards.add(new CardIdentity("Typhoid Rats", ""));
         cubeCards.add(new CardIdentity("Ulamog's Crusher", ""));
         cubeCards.add(new CardIdentity("Ulvenwald Captive", ""));
-        cubeCards.add(new CardIdentity("Undying Rage", ""));
         cubeCards.add(new CardIdentity("Unearth", ""));
         cubeCards.add(new CardIdentity("Unmake", ""));
         cubeCards.add(new CardIdentity("Vampire Interloper", ""));
@@ -427,6 +426,7 @@ public class AdamStyborskisPauperCube extends DraftCube {
         cubeCards.add(new CardIdentity("Warped Landscape", ""));
         cubeCards.add(new CardIdentity("Warren Pilferers", ""));
         cubeCards.add(new CardIdentity("Wasteland Scorpion", ""));
+        cubeCards.add(new CardIdentity("Waterknot", ""));
         cubeCards.add(new CardIdentity("Wayfarer's Bauble", ""));
         cubeCards.add(new CardIdentity("Werebear", ""));
         cubeCards.add(new CardIdentity("Whitemane Lion", ""));
@@ -436,13 +436,13 @@ public class AdamStyborskisPauperCube extends DraftCube {
         cubeCards.add(new CardIdentity("Wildsize", ""));
         cubeCards.add(new CardIdentity("Will-Forged Golem", ""));
         cubeCards.add(new CardIdentity("Wind-Scarred Crag", ""));
-        cubeCards.add(new CardIdentity("Winds of Rebuke", ""));
         cubeCards.add(new CardIdentity("Winged Coatl", ""));
         cubeCards.add(new CardIdentity("Wojek Halberdiers", ""));
         cubeCards.add(new CardIdentity("Woodland Stream", ""));
         cubeCards.add(new CardIdentity("Wrecking Ball", ""));
         cubeCards.add(new CardIdentity("Wretched Gryff", ""));
         cubeCards.add(new CardIdentity("Yavimaya Elder", ""));
+        cubeCards.add(new CardIdentity("Yavimaya Sapherd", ""));
         cubeCards.add(new CardIdentity("Yotian Soldier", ""));
     }
 }

Mage.Server.Plugins/Mage.Tournament.Constructed/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.mage</groupId>
     <artifactId>mage-server-plugins</artifactId>
-    <version>1.4.29</version>
+    <version>1.4.30</version>
   </parent>
 
   <artifactId>mage-tournament-constructed</artifactId>

Mage.Server.Plugins/Mage.Tournament.Sealed/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.29</version>
+        <version>1.4.30</version>
     </parent>
 
     <artifactId>mage-tournament-sealed</artifactId>

Mage.Server.Plugins/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-root</artifactId>
-        <version>1.4.29</version>
+        <version>1.4.30</version>
     </parent>
 
     <artifactId>mage-server-plugins</artifactId>

Mage.Server/config/config.xml

@@ -1,187 +1,186 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Config.xsd">
-    <!--
-    Official guide to setup public server and NAT: https://www.slightlymagic.net/forum/viewtopic.php?f=70&t=15898
-
-    serverAddress       - ip or domain of the XMage server. Set it to "0.0.0.0" for local host or to the IP the server should use
-                          Public server should be accessable to all clients by it's name (example: xmage.mydomain.com)
-    port                - the port the primary server socket is bound to
-    secondaryBindPort   - the port to which the secondary server socket is to be bound. if "-1" is set , an arbitrary port is selected.
-    backlogSize         - the preferred number of unaccepted incoming connections allowed at a given time. The actual number may be greater
-                          than the specified backlog. When the queue is full, further connection requests are rejected. The JBoss default value is 200
-    numAcceptThreads    - the number of threads listening on the ServerSocket. The JBoss default value is 1
-    maxPoolSize         - the maximum number of ServerThreads that can exist at any given time. The JBoss default value is 300
-    leasePeriod         - To turn on server side connection failure detection of remoting clients, it is necessary to satisfy two criteria.
-                          The first is that the client lease period is set and is a value greater than 0. The value is represented in milliseconds.
-                          The client lease period can be set by either the 'clientLeasePeriod' attribute within the Connector configuration or by calling the Connector method
-    socketWriteTimeout  - All write operations will time out if they do not complete within the configured period.
-    maxGameThreads      - Number of games that can be started simultanously on the server
-    maxSecondsIdle      - Number of seconds after that a game is auto conceded by the player that was idle for such a time
-    minUserNameLength   - minmal allowed length of a user name to connect to the server
-    maxUserNameLength   - maximal allowed length of a user name to connect to the server
-    userNamePattern     - pattern for user name validity check
-    maxAiOpponents      - number of allowed AI opponents on the server
-    saveGameActivated   - allow game save and replay options (not working correctly yet)
-
-    authenticationActivated - "true" = user have to register to signon "false" = user need not to register
-    * mail configs only needed if authentication is activated:
-    * if mailUser = "" mailgun is used otherwise nativ mail server on the system
-    googleAccount       - not supported currently
-    mailgunApiKey       - key from the mailgun domain  e.g. = "key-12121111..."
-    mailgunDomain       - domain for the mailgun message sending
-    mailSmtpHost        - hostname to send the mail
-    mailSmtpPort        - port to send the mail
-    mailUser            - username used to send the mail
-    mailPassword        - passworf of the used user to send the mail
-    mailFromAddress     - sender address
-    -->
-    <server serverAddress="0.0.0.0"
-            serverName="mage-server"
-            port="17171"
-            secondaryBindPort="17179"
-            backlogSize="200"
-            numAcceptThreads="2"
-            maxPoolSize="300"
-            leasePeriod="5000"
-            socketWriteTimeout="10000"
-            maxGameThreads="10"
-            maxSecondsIdle="300"
-            minUserNameLength="3"
-            maxUserNameLength="14"
-            invalidUserNamePattern="[^a-z0-9_]"
-            minPasswordLength="8"
-            maxPasswordLength="100"
-            maxAiOpponents="15"
-            saveGameActivated="false"
-            authenticationActivated="false"
-            googleAccount=""
-            mailgunApiKey="key-d93e81f19a9c9ed243ebb7cc9381385c"
-            mailgunDomain="sandbox401a433f30d445309a5e86b6c53f7812.mailgun.org"
-            mailSmtpHost="smtp.1und1.de"
-            mailSmtpPort="465"
-            mailUser="xmageserver@online.de"
-            mailPassword="24wrsfxv"
-            mailFromAddress="xmageserver@online.de"
-    />
-    <playerTypes>
-        <playerType name="Human" jar="mage-player-human.jar" className="mage.player.human.HumanPlayer"/>
-        <!--<playerType name="Computer - minimax" jar="mage-player-aiminimax.jar" className="mage.player.ai.ComputerPlayer3"/>-->
-        <playerType name="Computer - mad" jar="mage-player-ai-ma.jar" className="mage.player.ai.ComputerPlayer7"/>
-        <!--<playerType name="Computer - monte carlo" jar="mage-player-aimcts.jar" className="mage.player.ai.ComputerPlayerMCTS"/>-->
-        <playerType name="Computer - draftbot" jar="mage-player-ai-draft-bot.jar" className="mage.player.ai.ComputerDraftPlayer"/>
-    </playerTypes>
-    <gameTypes>
-        <gameType name="Two Player Duel" jar="mage-game-twoplayerduel.jar" className="mage.game.TwoPlayerMatch" typeName="mage.game.TwoPlayerDuelType"/>
-        <gameType name="Free For All" jar="mage-game-freeforall.jar" className="mage.game.FreeForAllMatch" typeName="mage.game.FreeForAllType"/>
-        <gameType name="Commander Two Player Duel" jar="mage-game-commanderduel.jar" className="mage.game.CommanderDuelMatch" typeName="mage.game.CommanderDuelType"/>
-        <gameType name="Commander Free For All" jar="mage-game-commanderfreeforall.jar" className="mage.game.CommanderFreeForAllMatch" typeName="mage.game.CommanderFreeForAllType"/>
-        <gameType name="Tiny Leaders Two Player Duel" jar="mage-game-tinyleadersduel.jar" className="mage.game.TinyLeadersDuelMatch" typeName="mage.game.TinyLeadersDuelType"/>
-        <gameType name="Canadian Highlander Two Player Duel" jar="mage-game-canadianhighlanderduel.jar" className="mage.game.CanadianHighlanderDuelMatch" typeName="mage.game.CanadianHighlanderDuelType"/>
-        <gameType name="Penny Dreadful Commander Free For All" jar="mage-game-pennydreadfulcommanderfreeforall.jar" className="mage.game.PennyDreadfulCommanderFreeForAllMatch" typeName="mage.game.PennyDreadfulCommanderFreeForAllType"/>
-        <gameType name="Freeform Commander Free For All" jar="mage-game-freeformcommanderfreeforall.jar" className="mage.game.FreeformCommanderFreeForAllMatch" typeName="mage.game.FreeformCommanderFreeForAllType"/>
-        <gameType name="Brawl Two Player Duel" jar="mage-game-brawlduel.jar" className="mage.game.BrawlDuelMatch" typeName="mage.game.BrawlDuelType"/>
-        <gameType name="Brawl Free For All" jar="mage-game-brawlfreeforall.jar" className="mage.game.BrawlFreeForAllMatch" typeName="mage.game.BrawlFreeForAllType"/>
-        <gameType name="Momir Basic Two Player Duel" jar="mage-game-momirduel.jar" className="mage.game.MomirDuelMatch" typeName="mage.game.MomirDuelType"/>
-        <gameType name="Momir Basic Free For All" jar="mage-game-momir.jar" className="mage.game.MomirFreeForAllMatch" typeName="mage.game.MomirFreeForAllType"/>
-    </gameTypes>
-    <tournamentTypes>
-        <tournamentType name="Constructed Elimination" jar="mage-tournament-constructed.jar" className="mage.tournament.ConstructedEliminationTournament" typeName="mage.tournament.ConstructedEliminationTournamentType"/>
-        <tournamentType name="Constructed Swiss" jar="mage-tournament-constructed.jar" className="mage.tournament.ConstructedSwissTournament" typeName="mage.tournament.ConstructedSwissTournamentType"/>
-        <tournamentType name="Booster Draft Elimination" jar="mage-tournament-booster-draft.jar" className="mage.tournament.BoosterDraftEliminationTournament" typeName="mage.tournament.BoosterDraftEliminationTournamentType"/>
-        <tournamentType name="Booster Draft Elimination (Cube)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.BoosterDraftEliminationTournament" typeName="mage.tournament.BoosterDraftEliminationCubeTournamentType"/>
-        <tournamentType name="Booster Draft Elimination (Random)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RandomBoosterDraftEliminationTournament" typeName="mage.tournament.RandomBoosterDraftEliminationTournamentType"/>
-        <tournamentType name="Booster Draft Elimination (Rich Man)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RichManDraftEliminationTournament" typeName="mage.tournament.RichManDraftEliminationTournamentType"/>
-        <tournamentType name="Booster Draft Elimination (Rich Man Cube)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RichManCubeDraftEliminationTournament" typeName="mage.tournament.RichManCubeDraftEliminationTournamentType"/>
-        <tournamentType name="Booster Draft Swiss" jar="mage-tournament-booster-draft.jar" className="mage.tournament.BoosterDraftSwissTournament" typeName="mage.tournament.BoosterDraftSwissTournamentType"/>
-        <tournamentType name="Booster Draft Swiss (Cube)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.BoosterDraftSwissTournament" typeName="mage.tournament.BoosterDraftSwissCubeTournamentType"/>
-        <tournamentType name="Booster Draft Swiss (Random)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RandomBoosterDraftSwissTournament" typeName="mage.tournament.RandomBoosterDraftSwissTournamentType"/>
-        <tournamentType name="Sealed Elimination" jar="mage-tournament-sealed.jar" className="mage.tournament.SealedEliminationTournament" typeName="mage.tournament.SealedEliminationTournamentType"/>
-        <tournamentType name="Sealed Elimination (Cube)" jar="mage-tournament-sealed.jar" className="mage.tournament.SealedEliminationTournament" typeName="mage.tournament.SealedEliminationCubeTournamentType"/>
-        <tournamentType name="Sealed Swiss" jar="mage-tournament-sealed.jar" className="mage.tournament.SealedSwissTournament" typeName="mage.tournament.SealedSwissTournamentType"/>
-        <tournamentType name="Sealed Swiss (Cube)" jar="mage-tournament-sealed.jar" className="mage.tournament.SealedSwissTournament" typeName="mage.tournament.SealedSwissCubeTournamentType"/>
-    </tournamentTypes>
-    <draftCubes>
-        <draftCube name="Adam Styborski's Pauper Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.AdamStyborskisPauperCube"/>
-        <draftCube name="Ben's Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.BensCube"/>
-        <draftCube name="Cube Tutor 360 Pauper" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.CubeTutor360Pauper"/>
-        <draftCube name="Cube Tutor 720" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.CubeTutor720"/>
-        <draftCube name="Eric Klug's Pro Tour Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.EricKlugsProTourCube"/>
-        <draftCube name="Guillaume Matignon's Jenny's/Johnny's Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.GuillaumeMatignonsJennysJohnnysCube"/>
-        <draftCube name="Jim Davis's Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.JimDavisCube"/>
-        <draftCube name="Joseph Vasoli's Peasant Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.JosephVasolisPeasantCube"/>
-        <draftCube name="Mono Blue Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.MonoBlueCube"/>
-        <draftCube name="Sam Black's No Search Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.SamBlacksCube"/>
-        <draftCube name="Timothee Simonot's Twisted Color Pie Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.TimotheeSimonotsTwistedColorPieCube"/>
-        <draftCube name="MTGO Cube March 2014" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.MTGOMarchCube2014"/>
-        <draftCube name="MTGO Legacy Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegacyCube"/>
-        <draftCube name="MTGO Legacy Cube 2015 March" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegacyCubeMarch2015"/>
-        <draftCube name="MTGO Legacy Cube 2015 September" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegacyCubeSeptember2015"/>
-        <draftCube name="MTGO Legacy Cube 2016 January" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegacyCubeJanuary2016"/>
-        <draftCube name="MTGO Legacy Cube 2016 September" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegacyCubeSeptember2016"/>
-        <draftCube name="MTGO Legacy Cube 2017 January" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegacyCubeJanuary2017"/>
-        <draftCube name="MTGO Legacy Cube 2017 April" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegacyCubeApril2017"/>
-        <draftCube name="MTGO Legacy Cube 2018 February" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegacyCube2018February"/>
-        <draftCube name="MTGO Legendary Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegendaryCube"/>
-        <draftCube name="MTGO Legendary Cube April 2016" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegendaryCubeApril2016"/>
-        <draftCube name="MTGO Modern Cube 2017" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.ModernCube2017"/>
-        <draftCube name="MTGO Vintage Cube 2013" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.VintageCube2013"/>
-        <draftCube name="MTGO Vintage Cube 2014" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.VintageCube2014"/>
-        <draftCube name="MTGO Vintage Cube 2015" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.VintageCube2015"/>
-        <draftCube name="MTGO Vintage Cube 2016" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.VintageCube2016"/>
-        <draftCube name="MTGO Vintage Cube June 2016" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.VintageCubeJune2016"/>
-        <draftCube name="MTGO Vintage Cube November 2016" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.VintageCubeNovember2016"/>
-        <draftCube name="MTGO Vintage Cube June 2017" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.VintageCubeJune2017"/>
-        <draftCube name="MTGO Vintage Cube December 2017" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.VintageCubeDecember2017"/>
-        <draftCube name="The Peasant's Toolbox" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.PeasantsToolboxCube"/>
-        <draftCube name="www.MTGCube.com" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.MTGCube"/>
-        <draftCube name="Cube From Deck" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.CubeFromDeck"/>
-    </draftCubes>
-    <deckTypes>
-        <deckType name="Constructed - Standard" jar="mage-deck-constructed.jar" className="mage.deck.Standard"/>
-        <deckType name="Constructed - Extended" jar="mage-deck-constructed.jar" className="mage.deck.Extended"/>
-        <deckType name="Constructed - Frontier" jar="mage-deck-constructed.jar" className="mage.deck.Frontier"/>
-        <deckType name="Constructed - Modern" jar="mage-deck-constructed.jar" className="mage.deck.Modern"/>
-        <deckType name="Constructed - Modern - No Banned List" jar="mage-deck-constructed.jar" className="mage.deck.ModernNoBannedList"/>
-        <deckType name="Constructed - Eternal" jar="mage-deck-constructed.jar" className="mage.deck.Eternal"/>
-        <deckType name="Constructed - Legacy" jar="mage-deck-constructed.jar" className="mage.deck.Legacy"/>
-        <deckType name="Constructed - Vintage" jar="mage-deck-constructed.jar" className="mage.deck.Vintage"/>
-        <deckType name="Constructed - Pauper" jar="mage-deck-constructed.jar" className="mage.deck.Pauper"/>
-        <deckType name="Constructed - Historical Type 2" jar="mage-deck-constructed.jar" className="mage.deck.HistoricalType2"/>
-        <deckType name="Constructed - Super Type 2" jar="mage-deck-constructed.jar" className="mage.deck.SuperType2"/>
-        <deckType name="Constructed - Freeform" jar="mage-deck-constructed.jar" className="mage.deck.Freeform"/>
-        <deckType name="Constructed - Old School 93/94" jar="mage-deck-constructed.jar" className="mage.deck.OldSchool9394"/>
-	    <deckType name="Constructed - Old School 93/94 - Italian Rules" jar="mage-deck-constructed.jar" className="mage.deck.OldSchool9394Italian"/>
-	    <deckType name="Constructed - Old School 93/94 - Channel Fireball Rules" jar="mage-deck-constructed.jar" className="mage.deck.OldSchool9394CFB"/>
-	    <deckType name="Constructed - Old School 93/94 - EudoGames Rules" jar="mage-deck-constructed.jar" className="mage.deck.OldSchool9394EG"/>
-	    <deckType name="Constructed - Old School 93/94 - EC Rules" jar="mage-deck-constructed.jar" className="mage.deck.OldSchool9394EC"/>
-        <deckType name="Constructed - Australian Highlander" jar="mage-deck-constructed.jar" className="mage.deck.AusHighlander"/>
-        <deckType name="Constructed - Canadian Highlander" jar="mage-deck-constructed.jar" className="mage.deck.CanadianHighlander"/>
-        <deckType name="Constructed - Freeform" jar="mage-deck-constructed.jar" className="mage.deck.Freeform"/>
-        <deckType name="Variant Magic - Commander" jar="mage-deck-constructed.jar" className="mage.deck.Commander"/>
-        <deckType name="Variant Magic - Duel Commander" jar="mage-deck-constructed.jar" className="mage.deck.DuelCommander"/>
-        <deckType name="Variant Magic - MTGO 1v1 Commander" jar="mage-deck-constructed.jar" className="mage.deck.MTGO1v1Commander"/>
-        <deckType name="Variant Magic - Tiny Leaders" jar="mage-deck-constructed.jar" className="mage.deck.TinyLeaders"/>
-        <deckType name="Variant Magic - Momir Basic" jar="mage-deck-constructed.jar" className="mage.deck.Momir"/>
-        <deckType name="Variant Magic - Penny Dreadful Commander" jar="mage-deck-constructed.jar" className="mage.deck.PennyDreadfulCommander"/>
-        <deckType name="Variant Magic - Freeform Commander" jar="mage-deck-constructed.jar" className="mage.deck.FreeformCommander"/>
-        <deckType name="Variant Magic - Brawl" jar="mage-deck-constructed.jar" className="mage.deck.Brawl"/>
-        <deckType name="Block Constructed - Amonkhet" jar="mage-deck-constructed.jar" className="mage.deck.AmonkhetBlock"/>
-        <deckType name="Block Constructed - Battle for Zendikar" jar="mage-deck-constructed.jar" className="mage.deck.BattleForZendikarBlock"/>
-        <deckType name="Block Constructed - Innistrad" jar="mage-deck-constructed.jar" className="mage.deck.InnistradBlock"/>
-        <deckType name="Block Constructed - Ixalan" jar="mage-deck-constructed.jar" className="mage.deck.IxalanBlock"/>
-        <deckType name="Block Constructed - Kaladesh" jar="mage-deck-constructed.jar" className="mage.deck.KaladeshBlock"/>
-        <deckType name="Block Constructed - Kamigawa" jar="mage-deck-constructed.jar" className="mage.deck.KamigawaBlock"/>
-        <deckType name="Block Constructed - Khans of Tarkir" jar="mage-deck-constructed.jar" className="mage.deck.KhansOfTarkirBlock"/>
-        <deckType name="Block Constructed - Lorwyn" jar="mage-deck-constructed.jar" className="mage.deck.LorwynBlock"/>
-        <deckType name="Block Constructed - Return to Ravnica" jar="mage-deck-constructed.jar" className="mage.deck.ReturnToRavnicaBlock"/>
-        <deckType name="Block Constructed - Scars of Mirrodin" jar="mage-deck-constructed.jar" className="mage.deck.ScarsOfMirrodinBlock"/>
-        <deckType name="Block Constructed - Shadowmoor" jar="mage-deck-constructed.jar" className="mage.deck.ShadowmoorBlock"/>
-        <deckType name="Block Constructed - Shadows over Innistrad" jar="mage-deck-constructed.jar" className="mage.deck.ShadowsOverInnistradBlock"/>
-        <deckType name="Block Constructed - Shards of Alara" jar="mage-deck-constructed.jar" className="mage.deck.ShardsOfAlaraBlock"/>
-        <deckType name="Block Constructed - Theros" jar="mage-deck-constructed.jar" className="mage.deck.TherosBlock"/>
-        <deckType name="Block Constructed - Zendikar" jar="mage-deck-constructed.jar" className="mage.deck.ZendikarBlock"/>
-        <deckType name="Block Constructed Custom - Star Wars" jar="mage-deck-constructed.jar" className="mage.deck.StarWarsBlock"/>
-        <deckType name="Limited" jar="mage-deck-limited.jar" className="mage.deck.Limited"/>
-    </deckTypes>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Config.xsd">
+    <!--
+    Official guide to setup public server and NAT: https://www.slightlymagic.net/forum/viewtopic.php?f=70&t=15898
+
+    serverAddress       - ip or domain of the XMage server. Set it to "0.0.0.0" for local host or to the IP the server should use
+                          Public server should be accessable to all clients by it's name (example: xmage.mydomain.com)
+    port                - the port the primary server socket is bound to
+    secondaryBindPort   - the port to which the secondary server socket is to be bound. if "-1" is set , an arbitrary port is selected.
+    backlogSize         - the preferred number of unaccepted incoming connections allowed at a given time. The actual number may be greater
+                          than the specified backlog. When the queue is full, further connection requests are rejected. The JBoss default value is 200
+    numAcceptThreads    - the number of threads listening on the ServerSocket. The JBoss default value is 1
+    maxPoolSize         - the maximum number of ServerThreads that can exist at any given time. The JBoss default value is 300
+    leasePeriod         - To turn on server side connection failure detection of remoting clients, it is necessary to satisfy two criteria.
+                          The first is that the client lease period is set and is a value greater than 0. The value is represented in milliseconds.
+                          The client lease period can be set by either the 'clientLeasePeriod' attribute within the Connector configuration or by calling the Connector method
+    socketWriteTimeout  - All write operations will time out if they do not complete within the configured period.
+    maxGameThreads      - Number of games that can be started simultanously on the server
+    maxSecondsIdle      - Number of seconds after that a game is auto conceded by the player that was idle for such a time
+    minUserNameLength   - minmal allowed length of a user name to connect to the server
+    maxUserNameLength   - maximal allowed length of a user name to connect to the server
+    userNamePattern     - pattern for user name validity check
+    maxAiOpponents      - number of allowed AI opponents on the server
+    saveGameActivated   - allow game save and replay options (not working correctly yet)
+
+    authenticationActivated - "true" = user have to register to signon "false" = user need not to register
+    * mail configs only needed if authentication is activated:
+    * if mailUser = "" mailgun is used otherwise nativ mail server on the system
+    googleAccount       - not supported currently
+    mailgunApiKey       - key from the mailgun domain  e.g. = "key-12121111..."
+    mailgunDomain       - domain for the mailgun message sending
+    mailSmtpHost        - hostname to send the mail
+    mailSmtpPort        - port to send the mail
+    mailUser            - username used to send the mail
+    mailPassword        - passworf of the used user to send the mail
+    mailFromAddress     - sender address
+    -->
+    <server serverAddress="0.0.0.0"
+            serverName="mage-server"
+            port="17171"
+            secondaryBindPort="17179"
+            backlogSize="200"
+            numAcceptThreads="2"
+            maxPoolSize="300"
+            leasePeriod="5000"
+            socketWriteTimeout="10000"
+            maxGameThreads="10"
+            maxSecondsIdle="300"
+            minUserNameLength="3"
+            maxUserNameLength="14"
+            invalidUserNamePattern="[^a-z0-9_]"
+            minPasswordLength="8"
+            maxPasswordLength="100"
+            maxAiOpponents="15"
+            saveGameActivated="false"
+            authenticationActivated="false"
+            googleAccount=""
+            mailgunApiKey="key-d93e81f19a9c9ed243ebb7cc9381385c"
+            mailgunDomain="sandbox401a433f30d445309a5e86b6c53f7812.mailgun.org"
+            mailSmtpHost="smtp.1und1.de"
+            mailSmtpPort="465"
+            mailUser="xmageserver@online.de"
+            mailPassword="24wrsfxv"
+            mailFromAddress="xmageserver@online.de"
+    />
+    <playerTypes>
+        <playerType name="Human" jar="mage-player-human.jar" className="mage.player.human.HumanPlayer"/>
+        <!--<playerType name="Computer - minimax" jar="mage-player-aiminimax.jar" className="mage.player.ai.ComputerPlayer3"/>-->
+        <playerType name="Computer - mad" jar="mage-player-ai-ma.jar" className="mage.player.ai.ComputerPlayer7"/>
+        <!--<playerType name="Computer - monte carlo" jar="mage-player-aimcts.jar" className="mage.player.ai.ComputerPlayerMCTS"/>-->
+        <playerType name="Computer - draftbot" jar="mage-player-ai-draft-bot.jar" className="mage.player.ai.ComputerDraftPlayer"/>
+    </playerTypes>
+    <gameTypes>
+        <gameType name="Two Player Duel" jar="mage-game-twoplayerduel.jar" className="mage.game.TwoPlayerMatch" typeName="mage.game.TwoPlayerDuelType"/>
+        <gameType name="Free For All" jar="mage-game-freeforall.jar" className="mage.game.FreeForAllMatch" typeName="mage.game.FreeForAllType"/>
+        <gameType name="Commander Two Player Duel" jar="mage-game-commanderduel.jar" className="mage.game.CommanderDuelMatch" typeName="mage.game.CommanderDuelType"/>
+        <gameType name="Commander Free For All" jar="mage-game-commanderfreeforall.jar" className="mage.game.CommanderFreeForAllMatch" typeName="mage.game.CommanderFreeForAllType"/>
+        <gameType name="Tiny Leaders Two Player Duel" jar="mage-game-tinyleadersduel.jar" className="mage.game.TinyLeadersDuelMatch" typeName="mage.game.TinyLeadersDuelType"/>
+        <gameType name="Canadian Highlander Two Player Duel" jar="mage-game-canadianhighlanderduel.jar" className="mage.game.CanadianHighlanderDuelMatch" typeName="mage.game.CanadianHighlanderDuelType"/>
+        <gameType name="Penny Dreadful Commander Free For All" jar="mage-game-pennydreadfulcommanderfreeforall.jar" className="mage.game.PennyDreadfulCommanderFreeForAllMatch" typeName="mage.game.PennyDreadfulCommanderFreeForAllType"/>
+        <gameType name="Freeform Commander Free For All" jar="mage-game-freeformcommanderfreeforall.jar" className="mage.game.FreeformCommanderFreeForAllMatch" typeName="mage.game.FreeformCommanderFreeForAllType"/>
+        <gameType name="Brawl Two Player Duel" jar="mage-game-brawlduel.jar" className="mage.game.BrawlDuelMatch" typeName="mage.game.BrawlDuelType"/>
+        <gameType name="Brawl Free For All" jar="mage-game-brawlfreeforall.jar" className="mage.game.BrawlFreeForAllMatch" typeName="mage.game.BrawlFreeForAllType"/>
+        <gameType name="Momir Basic Two Player Duel" jar="mage-game-momirduel.jar" className="mage.game.MomirDuelMatch" typeName="mage.game.MomirDuelType"/>
+        <gameType name="Momir Basic Free For All" jar="mage-game-momir.jar" className="mage.game.MomirFreeForAllMatch" typeName="mage.game.MomirFreeForAllType"/>
+    </gameTypes>
+    <tournamentTypes>
+        <tournamentType name="Constructed Elimination" jar="mage-tournament-constructed.jar" className="mage.tournament.ConstructedEliminationTournament" typeName="mage.tournament.ConstructedEliminationTournamentType"/>
+        <tournamentType name="Constructed Swiss" jar="mage-tournament-constructed.jar" className="mage.tournament.ConstructedSwissTournament" typeName="mage.tournament.ConstructedSwissTournamentType"/>
+        <tournamentType name="Booster Draft Elimination" jar="mage-tournament-booster-draft.jar" className="mage.tournament.BoosterDraftEliminationTournament" typeName="mage.tournament.BoosterDraftEliminationTournamentType"/>
+        <tournamentType name="Booster Draft Elimination (Cube)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.BoosterDraftEliminationTournament" typeName="mage.tournament.BoosterDraftEliminationCubeTournamentType"/>
+        <tournamentType name="Booster Draft Elimination (Random)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RandomBoosterDraftEliminationTournament" typeName="mage.tournament.RandomBoosterDraftEliminationTournamentType"/>
+        <tournamentType name="Booster Draft Elimination (Rich Man)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RichManDraftEliminationTournament" typeName="mage.tournament.RichManDraftEliminationTournamentType"/>
+        <tournamentType name="Booster Draft Elimination (Rich Man Cube)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RichManCubeDraftEliminationTournament" typeName="mage.tournament.RichManCubeDraftEliminationTournamentType"/>
+        <tournamentType name="Booster Draft Swiss" jar="mage-tournament-booster-draft.jar" className="mage.tournament.BoosterDraftSwissTournament" typeName="mage.tournament.BoosterDraftSwissTournamentType"/>
+        <tournamentType name="Booster Draft Swiss (Cube)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.BoosterDraftSwissTournament" typeName="mage.tournament.BoosterDraftSwissCubeTournamentType"/>
+        <tournamentType name="Booster Draft Swiss (Random)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RandomBoosterDraftSwissTournament" typeName="mage.tournament.RandomBoosterDraftSwissTournamentType"/>
+        <tournamentType name="Sealed Elimination" jar="mage-tournament-sealed.jar" className="mage.tournament.SealedEliminationTournament" typeName="mage.tournament.SealedEliminationTournamentType"/>
+        <tournamentType name="Sealed Elimination (Cube)" jar="mage-tournament-sealed.jar" className="mage.tournament.SealedEliminationTournament" typeName="mage.tournament.SealedEliminationCubeTournamentType"/>
+        <tournamentType name="Sealed Swiss" jar="mage-tournament-sealed.jar" className="mage.tournament.SealedSwissTournament" typeName="mage.tournament.SealedSwissTournamentType"/>
+        <tournamentType name="Sealed Swiss (Cube)" jar="mage-tournament-sealed.jar" className="mage.tournament.SealedSwissTournament" typeName="mage.tournament.SealedSwissCubeTournamentType"/>
+    </tournamentTypes>
+    <draftCubes>
+        <draftCube name="Adam Styborski's Pauper Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.AdamStyborskisPauperCube"/>
+        <draftCube name="Ben's Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.BensCube"/>
+        <draftCube name="Cube Tutor 360 Pauper" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.CubeTutor360Pauper"/>
+        <draftCube name="Cube Tutor 720" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.CubeTutor720"/>
+        <draftCube name="Eric Klug's Pro Tour Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.EricKlugsProTourCube"/>
+        <draftCube name="Guillaume Matignon's Jenny's/Johnny's Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.GuillaumeMatignonsJennysJohnnysCube"/>
+        <draftCube name="Jim Davis's Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.JimDavisCube"/>
+        <draftCube name="Joseph Vasoli's Peasant Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.JosephVasolisPeasantCube"/>
+        <draftCube name="Mono Blue Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.MonoBlueCube"/>
+        <draftCube name="Sam Black's No Search Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.SamBlacksCube"/>
+        <draftCube name="Timothee Simonot's Twisted Color Pie Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.TimotheeSimonotsTwistedColorPieCube"/>
+        <draftCube name="MTGO Cube March 2014" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.MTGOMarchCube2014"/>
+        <draftCube name="MTGO Legacy Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegacyCube"/>
+        <draftCube name="MTGO Legacy Cube 2015 March" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegacyCubeMarch2015"/>
+        <draftCube name="MTGO Legacy Cube 2015 September" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegacyCubeSeptember2015"/>
+        <draftCube name="MTGO Legacy Cube 2016 January" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegacyCubeJanuary2016"/>
+        <draftCube name="MTGO Legacy Cube 2016 September" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegacyCubeSeptember2016"/>
+        <draftCube name="MTGO Legacy Cube 2017 January" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegacyCubeJanuary2017"/>
+        <draftCube name="MTGO Legacy Cube 2017 April" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegacyCubeApril2017"/>
+        <draftCube name="MTGO Legacy Cube 2018 February" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegacyCube2018February"/>
+        <draftCube name="MTGO Legendary Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegendaryCube"/>
+        <draftCube name="MTGO Legendary Cube April 2016" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegendaryCubeApril2016"/>
+        <draftCube name="MTGO Modern Cube 2017" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.ModernCube2017"/>
+        <draftCube name="MTGO Vintage Cube 2013" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.VintageCube2013"/>
+        <draftCube name="MTGO Vintage Cube 2014" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.VintageCube2014"/>
+        <draftCube name="MTGO Vintage Cube 2015" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.VintageCube2015"/>
+        <draftCube name="MTGO Vintage Cube 2016" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.VintageCube2016"/>
+        <draftCube name="MTGO Vintage Cube June 2016" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.VintageCubeJune2016"/>
+        <draftCube name="MTGO Vintage Cube November 2016" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.VintageCubeNovember2016"/>
+        <draftCube name="MTGO Vintage Cube June 2017" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.VintageCubeJune2017"/>
+        <draftCube name="MTGO Vintage Cube December 2017" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.VintageCubeDecember2017"/>
+        <draftCube name="The Peasant's Toolbox" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.PeasantsToolboxCube"/>
+        <draftCube name="www.MTGCube.com" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.MTGCube"/>
+        <draftCube name="Cube From Deck" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.CubeFromDeck"/>
+    </draftCubes>
+    <deckTypes>
+        <deckType name="Constructed - Standard" jar="mage-deck-constructed.jar" className="mage.deck.Standard"/>
+        <deckType name="Constructed - Extended" jar="mage-deck-constructed.jar" className="mage.deck.Extended"/>
+        <deckType name="Constructed - Frontier" jar="mage-deck-constructed.jar" className="mage.deck.Frontier"/>
+        <deckType name="Constructed - Modern" jar="mage-deck-constructed.jar" className="mage.deck.Modern"/>
+        <deckType name="Constructed - Modern - No Banned List" jar="mage-deck-constructed.jar" className="mage.deck.ModernNoBannedList"/>
+        <deckType name="Constructed - Eternal" jar="mage-deck-constructed.jar" className="mage.deck.Eternal"/>
+        <deckType name="Constructed - Legacy" jar="mage-deck-constructed.jar" className="mage.deck.Legacy"/>
+        <deckType name="Constructed - Vintage" jar="mage-deck-constructed.jar" className="mage.deck.Vintage"/>
+        <deckType name="Constructed - Pauper" jar="mage-deck-constructed.jar" className="mage.deck.Pauper"/>
+        <deckType name="Constructed - Historical Type 2" jar="mage-deck-constructed.jar" className="mage.deck.HistoricalType2"/>
+        <deckType name="Constructed - Super Type 2" jar="mage-deck-constructed.jar" className="mage.deck.SuperType2"/>
+        <deckType name="Constructed - Australian Highlander" jar="mage-deck-constructed.jar" className="mage.deck.AusHighlander"/>
+        <deckType name="Constructed - Canadian Highlander" jar="mage-deck-constructed.jar" className="mage.deck.CanadianHighlander"/>
+        <deckType name="Constructed - Old School 93/94" jar="mage-deck-constructed.jar" className="mage.deck.OldSchool9394"/>
+        <deckType name="Constructed - Old School 93/94 - Italian Rules" jar="mage-deck-constructed.jar" className="mage.deck.OldSchool9394Italian"/>
+        <deckType name="Constructed - Old School 93/94 - Channel Fireball Rules" jar="mage-deck-constructed.jar" className="mage.deck.OldSchool9394CFB"/>
+        <deckType name="Constructed - Old School 93/94 - EudoGames Rules" jar="mage-deck-constructed.jar" className="mage.deck.OldSchool9394EG"/>
+        <deckType name="Constructed - Old School 93/94 - EC Rules" jar="mage-deck-constructed.jar" className="mage.deck.OldSchool9394EC"/>
+        <deckType name="Constructed - Freeform" jar="mage-deck-constructed.jar" className="mage.deck.Freeform"/>
+        <deckType name="Variant Magic - Commander" jar="mage-deck-constructed.jar" className="mage.deck.Commander"/>
+        <deckType name="Variant Magic - Duel Commander" jar="mage-deck-constructed.jar" className="mage.deck.DuelCommander"/>
+        <deckType name="Variant Magic - MTGO 1v1 Commander" jar="mage-deck-constructed.jar" className="mage.deck.MTGO1v1Commander"/>
+        <deckType name="Variant Magic - Tiny Leaders" jar="mage-deck-constructed.jar" className="mage.deck.TinyLeaders"/>
+        <deckType name="Variant Magic - Momir Basic" jar="mage-deck-constructed.jar" className="mage.deck.Momir"/>
+        <deckType name="Variant Magic - Penny Dreadful Commander" jar="mage-deck-constructed.jar" className="mage.deck.PennyDreadfulCommander"/>
+        <deckType name="Variant Magic - Freeform Commander" jar="mage-deck-constructed.jar" className="mage.deck.FreeformCommander"/>
+        <deckType name="Variant Magic - Brawl" jar="mage-deck-constructed.jar" className="mage.deck.Brawl"/>
+        <deckType name="Block Constructed - Amonkhet" jar="mage-deck-constructed.jar" className="mage.deck.AmonkhetBlock"/>
+        <deckType name="Block Constructed - Battle for Zendikar" jar="mage-deck-constructed.jar" className="mage.deck.BattleForZendikarBlock"/>
+        <deckType name="Block Constructed - Innistrad" jar="mage-deck-constructed.jar" className="mage.deck.InnistradBlock"/>
+        <deckType name="Block Constructed - Ixalan" jar="mage-deck-constructed.jar" className="mage.deck.IxalanBlock"/>
+        <deckType name="Block Constructed - Kaladesh" jar="mage-deck-constructed.jar" className="mage.deck.KaladeshBlock"/>
+        <deckType name="Block Constructed - Kamigawa" jar="mage-deck-constructed.jar" className="mage.deck.KamigawaBlock"/>
+        <deckType name="Block Constructed - Khans of Tarkir" jar="mage-deck-constructed.jar" className="mage.deck.KhansOfTarkirBlock"/>
+        <deckType name="Block Constructed - Lorwyn" jar="mage-deck-constructed.jar" className="mage.deck.LorwynBlock"/>
+        <deckType name="Block Constructed - Return to Ravnica" jar="mage-deck-constructed.jar" className="mage.deck.ReturnToRavnicaBlock"/>
+        <deckType name="Block Constructed - Scars of Mirrodin" jar="mage-deck-constructed.jar" className="mage.deck.ScarsOfMirrodinBlock"/>
+        <deckType name="Block Constructed - Shadowmoor" jar="mage-deck-constructed.jar" className="mage.deck.ShadowmoorBlock"/>
+        <deckType name="Block Constructed - Shadows over Innistrad" jar="mage-deck-constructed.jar" className="mage.deck.ShadowsOverInnistradBlock"/>
+        <deckType name="Block Constructed - Shards of Alara" jar="mage-deck-constructed.jar" className="mage.deck.ShardsOfAlaraBlock"/>
+        <deckType name="Block Constructed - Theros" jar="mage-deck-constructed.jar" className="mage.deck.TherosBlock"/>
+        <deckType name="Block Constructed - Zendikar" jar="mage-deck-constructed.jar" className="mage.deck.ZendikarBlock"/>
+        <deckType name="Block Constructed Custom - Star Wars" jar="mage-deck-constructed.jar" className="mage.deck.StarWarsBlock"/>
+        <deckType name="Limited" jar="mage-deck-limited.jar" className="mage.deck.Limited"/>
+    </deckTypes>
 </config>

Mage.Server/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-root</artifactId>
-        <version>1.4.29</version>
+        <version>1.4.30</version>
     </parent>
 
     <artifactId>mage-server</artifactId>

Mage.Server/release/config/config.xml

@@ -142,10 +142,13 @@
         <deckType name="Constructed - Pauper" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.Pauper"/>
         <deckType name="Constructed - Historical Type 2" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.HistoricalType2"/>
         <deckType name="Constructed - Super Type 2" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.SuperType2"/>
-        <deckType name="Constructed - Freeform" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.Freeform"/>
-        <deckType name="Constructed - Old School 93/94" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.OldSchool9394"/>
         <deckType name="Constructed - Australian Highlander" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.AusHighlander"/>
         <deckType name="Constructed - Canadian Highlander" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.CanadianHighlander"/>
+        <deckType name="Constructed - Old School 93/94" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.OldSchool9394"/>
+        <deckType name="Constructed - Old School 93/94 - Italian Rules" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.OldSchool9394Italian"/>
+        <deckType name="Constructed - Old School 93/94 - Channel Fireball Rules" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.OldSchool9394CFB"/>
+        <deckType name="Constructed - Old School 93/94 - EudoGames Rules" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.OldSchool9394EG"/>
+        <deckType name="Constructed - Old School 93/94 - EC Rules" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.OldSchool9394EC"/>
         <deckType name="Constructed - Freeform" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.Freeform"/>
         <deckType name="Variant Magic - Commander" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.Commander"/>
         <deckType name="Variant Magic - Duel Commander" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.DuelCommander"/>

Mage.Server/src/main/java/mage/server/TableController.java

@@ -100,7 +100,7 @@ public class TableController {
         } else {
             controllerName = "System";
         }
-        table = new Table(roomId, options.getGameType(), options.getName(), controllerName, DeckValidatorFactory.instance.createDeckValidator(options.getDeckType()), 
+        table = new Table(roomId, options.getGameType(), options.getName(), controllerName, DeckValidatorFactory.instance.createDeckValidator(options.getDeckType()),
                 options.getPlayerTypes(), TableRecorderImpl.instance, match, options.getBannedUsers(), options.isPlaneChase());
         chatId = ChatManager.instance.createChatSession("Match Table " + table.getId());
         init();
@@ -120,7 +120,7 @@ public class TableController {
         } else {
             controllerName = "System";
         }
-        table = new Table(roomId, options.getTournamentType(), options.getName(), controllerName, DeckValidatorFactory.instance.createDeckValidator(options.getMatchOptions().getDeckType()), 
+        table = new Table(roomId, options.getTournamentType(), options.getName(), controllerName, DeckValidatorFactory.instance.createDeckValidator(options.getMatchOptions().getDeckType()),
                 options.getPlayerTypes(), TableRecorderImpl.instance, tournament, options.getMatchOptions().getBannedUsers(), options.isPlaneChase());
         chatId = ChatManager.instance.createChatSession("Tourn. table " + table.getId());
     }
@@ -486,7 +486,11 @@ public class TableController {
             if (userPlayerMap.get(userId) != null) {
                 return false;
             }
-            return UserManager.instance.getUser(userId).get().ccWatchGame(match.getGame().getId());
+            Optional<User> _user = UserManager.instance.getUser(userId);
+            if (!_user.isPresent()) {
+                return false;
+            }
+            return _user.get().ccWatchGame(match.getGame().getId());
         }
     }
 

Mage.Sets/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-root</artifactId>
-        <version>1.4.29</version>
+        <version>1.4.30</version>
     </parent>
 
     <groupId>org.mage</groupId>

Mage.Sets/src/mage/cards/a/AcademyRector.java

@@ -55,11 +55,12 @@ public final class AcademyRector extends CardImpl {
         this.toughness = new MageInt(2);
 
         // When Academy Rector dies, you may exile it. If you do, search your library for an enchantment card, put that card onto the battlefield, then shuffle your library.
-        this.addAbility(new DiesTriggeredAbility(new DoIfCostPaid(
-                new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterEnchantmentCard())),
-                new ExileSourceFromGraveCost(),
-                "Exile to search enchantment?"),
-                false
+        this.addAbility(new DiesTriggeredAbility(
+                new DoIfCostPaid(
+                        new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterEnchantmentCard())),
+                        new ExileSourceFromGraveCost(),
+                        "Exile to search for an enchantment?"
+                ), false
         ));
     }
 

Mage.Sets/src/mage/cards/a/AetherworksMarvel.java

@@ -29,6 +29,7 @@ package mage.cards.a;
 
 import java.util.Set;
 import java.util.UUID;
+import mage.MageObjectReference;
 import mage.abilities.Ability;
 import mage.abilities.common.PutIntoGraveFromBattlefieldAllTriggeredAbility;
 import mage.abilities.common.SimpleActivatedAbility;
@@ -55,7 +56,7 @@ import mage.target.common.TargetCardInLibrary;
 public final class AetherworksMarvel extends CardImpl {
 
     public AetherworksMarvel(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}");
+        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}");
         addSuperType(SuperType.LEGENDARY);
 
         // Whenever a permanent you control is put into a graveyard, you get {E}.
@@ -105,7 +106,7 @@ class AetherworksMarvelEffect extends OneShotEffect {
             TargetCard target = new TargetCardInLibrary(0, 1, new FilterNonlandCard("card to cast without paying its mana cost"));
             if (controller.choose(Outcome.PlayForFree, cards, target, game)) {
                 Card card = controller.getLibrary().getCard(target.getFirstTarget(), game);
-                if (card != null && controller.cast(card.getSpellAbility(), game, true)) {
+                if (card != null && controller.cast(card.getSpellAbility(), game, true, new MageObjectReference(source.getSourceObject(game), game))) {
                     cards.remove(card);
                 }
             }

Mage.Sets/src/mage/cards/a/AinokGuide.java

@@ -62,7 +62,7 @@ public final class AinokGuide extends CardImpl {
 
         // * Search your library for a basic land card, reveal it, then shuffle your library and put that card on top of it.
         Mode mode = new Mode();
-        mode.getEffects().add(new SearchLibraryPutOnLibraryEffect(new TargetCardInLibrary(StaticFilters.FILTER_BASIC_LAND_CARD), true, true));
+        mode.getEffects().add(new SearchLibraryPutOnLibraryEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true));
         ability.addMode(mode);
         this.addAbility(ability);
 

Mage.Sets/src/mage/cards/a/AngelOfGlorysRise.java

@@ -103,7 +103,7 @@ class AngelOfGlorysRiseEffect extends OneShotEffect {
             controller.moveCards(toExile, Zone.EXILED, source, game);
             FilterCreatureCard filterHuman = new FilterCreatureCard();
             filterHuman.add(new SubtypePredicate(SubType.HUMAN));
-            controller.moveCards(controller.getGraveyard().getCards(filterHuman, game), Zone.GRAVEYARD, source, game);
+            controller.moveCards(controller.getGraveyard().getCards(filterHuman, game), Zone.BATTLEFIELD, source, game);
         }
         return true;
     }

Mage.Sets/src/mage/cards/a/ArchfiendOfDespair.java

@@ -0,0 +1,123 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.a;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.BeginningOfEndStepTriggeredAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.continuous.CantGainLifeAllEffect;
+import mage.constants.SubType;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.TargetController;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.players.Player;
+import mage.watchers.common.PlayerLostLifeWatcher;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class ArchfiendOfDespair extends CardImpl {
+
+    public ArchfiendOfDespair(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{6}{B}{B}");
+
+        this.subtype.add(SubType.DEMON);
+        this.power = new MageInt(6);
+        this.toughness = new MageInt(6);
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+
+        // Your opponents can't gain life.
+        this.addAbility(new SimpleStaticAbility(
+                Zone.BATTLEFIELD,
+                new CantGainLifeAllEffect(
+                        Duration.WhileOnBattlefield,
+                        TargetController.OPPONENT
+                )
+        ));
+
+        // At the beginning of each end step, each opponent loses life equal to the life that player lost this turn. (Damage causes loss of life.)
+        this.addAbility(new BeginningOfEndStepTriggeredAbility(new ArchfiendOfDespairEffect(), TargetController.ANY, false));
+    }
+
+    public ArchfiendOfDespair(final ArchfiendOfDespair card) {
+        super(card);
+    }
+
+    @Override
+    public ArchfiendOfDespair copy() {
+        return new ArchfiendOfDespair(this);
+    }
+}
+
+class ArchfiendOfDespairEffect extends OneShotEffect {
+
+    public ArchfiendOfDespairEffect() {
+        super(Outcome.LoseLife);
+        this.staticText = "each opponent loses life equal to the life he or she lost this turn";
+    }
+
+    public ArchfiendOfDespairEffect(final ArchfiendOfDespairEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public ArchfiendOfDespairEffect copy() {
+        return new ArchfiendOfDespairEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player controller = game.getPlayer(source.getControllerId());
+        PlayerLostLifeWatcher watcher = (PlayerLostLifeWatcher) game.getState().getWatchers().get(PlayerLostLifeWatcher.class.getSimpleName());
+        if (controller != null && watcher != null) {
+            for (UUID playerId : game.getOpponents(controller.getId())) {
+                Player opponent = game.getPlayer(playerId);
+                if (opponent != null) {
+                    int lifeLost = watcher.getLiveLost(playerId);
+                    if (lifeLost > 0) {
+                        opponent.loseLife(lifeLost, game, false);
+                    }
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+}

Mage.Sets/src/mage/cards/a/ArchonOfValorsReach.java

@@ -0,0 +1,214 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.a;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.MageObject;
+import mage.abilities.Ability;
+import mage.abilities.common.AsEntersBattlefieldAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.ContinuousRuleModifyingEffectImpl;
+import mage.abilities.effects.OneShotEffect;
+import mage.constants.SubType;
+import mage.abilities.keyword.FlyingAbility;
+import mage.abilities.keyword.VigilanceAbility;
+import mage.abilities.keyword.TrampleAbility;
+import mage.cards.Card;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.choices.ChoiceImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+import mage.util.CardUtil;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class ArchonOfValorsReach extends CardImpl {
+
+    public ArchonOfValorsReach(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{W}{G}");
+
+        this.subtype.add(SubType.ARCHON);
+        this.power = new MageInt(5);
+        this.toughness = new MageInt(6);
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+
+        // Vigilance
+        this.addAbility(VigilanceAbility.getInstance());
+
+        // Trample
+        this.addAbility(TrampleAbility.getInstance());
+
+        // As Archon of Valor's Reach enters the battlefield, choose artifact, enchantment, instant, sorcery, or planeswalker.
+        this.addAbility(new AsEntersBattlefieldAbility(new ArchonOfValorsReachChooseEffect()));
+
+        // Players can't cast spells of the chosen type.
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ArchonOfValorsReachReplacementEffect()));
+    }
+
+    public ArchonOfValorsReach(final ArchonOfValorsReach card) {
+        super(card);
+    }
+
+    @Override
+    public ArchonOfValorsReach copy() {
+        return new ArchonOfValorsReach(this);
+    }
+}
+
+class ArchonOfValorsReachChooseEffect extends OneShotEffect {
+
+    public static String VALUE_KEY = "_cardtype";
+
+    public ArchonOfValorsReachChooseEffect() {
+        super(Outcome.Benefit);
+        this.staticText = "choose artifact, enchantment, instant, sorcery, or planeswalker";
+    }
+
+    public ArchonOfValorsReachChooseEffect(final ArchonOfValorsReachChooseEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public ArchonOfValorsReachChooseEffect copy() {
+        return new ArchonOfValorsReachChooseEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player controller = game.getPlayer(source.getControllerId());
+        MageObject mageObject = game.getPermanentEntering(source.getSourceId());
+        if (mageObject == null) {
+            mageObject = game.getObject(source.getSourceId());
+        }
+        if (controller != null && mageObject != null) {
+            ArchonOfValorsReachChoice choices = new ArchonOfValorsReachChoice();
+            if (controller.choose(Outcome.Neutral, choices, game)) {
+                game.informPlayers(mageObject.getName() + ":  Chosen card type is " + choices.getChoice());
+                System.out.println(mageObject.getId());
+                game.getState().setValue(mageObject.getId().toString() + VALUE_KEY, choices.getChoice());
+                if (mageObject instanceof Permanent) {
+                    ((Permanent) mageObject).addInfo("chosen color", CardUtil.addToolTipMarkTags("Chosen card type: " + choices.getChoice()), game);
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+}
+
+class ArchonOfValorsReachChoice extends ChoiceImpl {
+
+    public ArchonOfValorsReachChoice() {
+        super(true);
+        this.choices.add("Artifact");
+        this.choices.add("Enchantment");
+        this.choices.add("Instant");
+        this.choices.add("Sorcery");
+        this.choices.add("Planeswalker");
+        this.message = "Choose artifact, enchantment, instant, sorcery, or planeswalker";
+    }
+
+    public ArchonOfValorsReachChoice(final ArchonOfValorsReachChoice choice) {
+        super(choice);
+    }
+
+    public static CardType getType(String ch) {
+        switch (ch) {
+            case "Artifact":
+                return CardType.ARTIFACT;
+            case "Enchantment":
+                return CardType.ENCHANTMENT;
+            case "Instant":
+                return CardType.INSTANT;
+            case "Sorcery":
+                return CardType.SORCERY;
+            case "Planewswalker":
+                return CardType.PLANESWALKER;
+            default:
+                return null;
+        }
+    }
+
+    @Override
+    public ArchonOfValorsReachChoice copy() {
+        return new ArchonOfValorsReachChoice(this);
+    }
+
+}
+
+class ArchonOfValorsReachReplacementEffect extends ContinuousRuleModifyingEffectImpl {
+
+    ArchonOfValorsReachReplacementEffect() {
+        super(Duration.WhileOnBattlefield, Outcome.Detriment);
+        staticText = "Players can't cast spells of the chosen type";
+    }
+
+    ArchonOfValorsReachReplacementEffect(final ArchonOfValorsReachReplacementEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public String getInfoMessage(Ability source, GameEvent event, Game game) {
+        CardType cardType = (CardType) game.getState().getValue(source.getSourceId().toString() + "_cardtype");
+        MageObject mageObject = game.getObject(source.getSourceId());
+        if (mageObject != null && cardType != null) {
+            return "You can't cast " + cardType.toString() + " spells (" + mageObject.getIdName() + ").";
+        }
+        return null;
+    }
+
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.CAST_SPELL;
+    }
+
+    @Override
+    public boolean applies(GameEvent event, Ability source, Game game) {
+        CardType cardType = ArchonOfValorsReachChoice.getType((String) game.getState().getValue(source.getSourceId().toString() + "_cardtype"));
+        // spell is not on the stack yet, so we have to check the card
+        Card card = game.getCard(event.getSourceId());
+        return cardType != null && card != null && card.getCardType().contains(cardType);
+    }
+
+    @Override
+    public ArchonOfValorsReachReplacementEffect copy() {
+        return new ArchonOfValorsReachReplacementEffect(this);
+    }
+}

Mage.Sets/src/mage/cards/a/ArenaRector.java

@@ -0,0 +1,75 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.a;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.DiesTriggeredAbility;
+import mage.abilities.costs.common.ExileSourceFromGraveCost;
+import mage.abilities.effects.common.DoIfCostPaid;
+import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.filter.common.FilterPlaneswalkerCard;
+import mage.target.common.TargetCardInLibrary;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class ArenaRector extends CardImpl {
+
+    public ArenaRector(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}");
+
+        this.subtype.add(SubType.HUMAN);
+        this.subtype.add(SubType.CLERIC);
+        this.power = new MageInt(1);
+        this.toughness = new MageInt(2);
+
+        // When Arena Rector dies, you may exile it. If you do, search your library for a planeswalker card, put it onto the battlefield, then shuffle your library.
+        this.addAbility(new DiesTriggeredAbility(
+                new DoIfCostPaid(
+                        new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterPlaneswalkerCard())),
+                        new ExileSourceFromGraveCost(),
+                        "Exile to search for a planeswalker?"
+                ).setText("you may exile it. If you do, search your library for a planeswalker card, put it onto the battlefield, then shuffle your library"), false
+        ));
+    }
+
+    public ArenaRector(final ArenaRector card) {
+        super(card);
+    }
+
+    @Override
+    public ArenaRector copy() {
+        return new ArenaRector(this);
+    }
+}

Mage.Sets/src/mage/cards/a/ArmillarySphere.java

@@ -53,7 +53,7 @@ public final class ArmillarySphere extends CardImpl {
 
         // {2}, {tap}, Sacrifice Armillary Sphere: Search your library for up to two basic land cards, reveal them, and put them into your hand. Then shuffle your library.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
-                new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 2, StaticFilters.FILTER_BASIC_LAND_CARD), true, true),
+                new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 2, StaticFilters.FILTER_CARD_BASIC_LAND), true, true),
                 new GenericManaCost(2));
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());

Mage.Sets/src/mage/cards/a/AtarkasCommand.java

@@ -31,7 +31,7 @@ import java.util.UUID;
 import mage.abilities.Mode;
 import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.DamagePlayersEffect;
-import mage.abilities.effects.common.PutLandFromHandOntoBattlefieldEffect;
+import mage.abilities.effects.common.PutCardFromHandOntoBattlefieldEffect;
 import mage.abilities.effects.common.continuous.BoostControlledEffect;
 import mage.abilities.effects.common.continuous.CantGainLifeAllEffect;
 import mage.abilities.effects.common.continuous.GainAbilityControlledEffect;
@@ -41,6 +41,7 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.TargetController;
+import mage.filter.StaticFilters;
 
 /**
  *
@@ -49,35 +50,35 @@ import mage.constants.TargetController;
 public final class AtarkasCommand extends CardImpl {
 
     public AtarkasCommand(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{R}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{R}{G}");
 
-        // Choose two - 
+        // Choose two -
         this.getSpellAbility().getModes().setMinModes(2);
         this.getSpellAbility().getModes().setMaxModes(2);
-        
-        // Your opponents can't gain life this turn; 
+
+        // Your opponents can't gain life this turn;
         this.getSpellAbility().addEffect(new CantGainLifeAllEffect(Duration.EndOfTurn, TargetController.OPPONENT));
-        
-        // or Atarka's Command deals 3 damage to each opponent; 
+
+        // or Atarka's Command deals 3 damage to each opponent;
         Mode mode = new Mode();
         mode.getEffects().add(new DamagePlayersEffect(3, TargetController.OPPONENT));
         this.getSpellAbility().addMode(mode);
-        
-        // or You may put a land card from your hand onto the battlefield; 
+
+        // or You may put a land card from your hand onto the battlefield;
         mode = new Mode();
-        mode.getEffects().add(new PutLandFromHandOntoBattlefieldEffect());
+        mode.getEffects().add(new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_LAND_A));
         this.getSpellAbility().addMode(mode);
 
         // or Creatures you control get +1/+1 and gain reach until the end of turn.
         mode = new Mode();
-        Effect effect = new BoostControlledEffect(1,1, Duration.EndOfTurn);
-        effect.setText("Creatures you control get +1/+1");        
+        Effect effect = new BoostControlledEffect(1, 1, Duration.EndOfTurn);
+        effect.setText("Creatures you control get +1/+1");
         mode.getEffects().add(effect);
         effect = new GainAbilityControlledEffect(ReachAbility.getInstance(), Duration.EndOfTurn);
-        effect.setText("and gain reach until the end of turn");        
+        effect.setText("and gain reach until the end of turn");
         mode.getEffects().add(effect);
         this.getSpellAbility().addMode(mode);
-        
+
     }
 
     public AtarkasCommand(final AtarkasCommand card) {

Mage.Sets/src/mage/cards/a/AttuneWithAether.java

@@ -48,7 +48,7 @@ public final class AttuneWithAether extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{G}");
 
         // Search you library for a basic land card, reveal it, put it into your hand, then shuffle your library. You get {E}{E}.
-        Effect effect = new SearchLibraryPutInHandEffect(new TargetCardInLibrary(1, 1, StaticFilters.FILTER_BASIC_LAND_CARD), true);
+        Effect effect = new SearchLibraryPutInHandEffect(new TargetCardInLibrary(1, 1, StaticFilters.FILTER_CARD_BASIC_LAND), true);
         effect.setText("Search your library for a basic land card, reveal it, put it into your hand, then shuffle your library");
         this.getSpellAbility().addEffect(effect);
         this.getSpellAbility().addEffect(new GetEnergyCountersControllerEffect(2));

Mage.Sets/src/mage/cards/a/AuroraChampion.java

@@ -0,0 +1,83 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.a;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.AttacksTriggeredAbility;
+import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
+import mage.abilities.decorator.ConditionalTriggeredAbility;
+import mage.abilities.effects.common.TapTargetEffect;
+import mage.constants.SubType;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.filter.common.FilterTeamPermanent;
+import mage.filter.predicate.permanent.AnotherPredicate;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class AuroraChampion extends CardImpl {
+
+    private static final FilterTeamPermanent filter = new FilterTeamPermanent(SubType.WARRIOR, "another Warrior");
+
+    static {
+        filter.add(new AnotherPredicate());
+    }
+
+    public AuroraChampion(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}");
+
+        this.subtype.add(SubType.ELF);
+        this.subtype.add(SubType.WARRIOR);
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(2);
+
+        // Whenever Aurora Champion attacks, if your team controls another Warrior, tap target creature.
+        Ability ability = new ConditionalTriggeredAbility(
+                new AttacksTriggeredAbility(new TapTargetEffect(), false),
+                new PermanentsOnTheBattlefieldCondition(filter),
+                "Whenever {this} attacks, if your team controls another Warrior, tap target creature."
+        );
+        ability.addTarget(new TargetCreaturePermanent());
+        this.addAbility(ability);
+    }
+
+    public AuroraChampion(final AuroraChampion card) {
+        super(card);
+    }
+
+    @Override
+    public AuroraChampion copy() {
+        return new AuroraChampion(this);
+    }
+}

Mage.Sets/src/mage/cards/a/AzraBladeseeker.java

@@ -0,0 +1,137 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.a;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.OneShotEffect;
+import mage.cards.Card;
+import mage.constants.SubType;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.game.Game;
+import mage.players.Player;
+import mage.target.Target;
+import mage.target.common.TargetDiscard;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class AzraBladeseeker extends CardImpl {
+
+    public AzraBladeseeker(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}");
+
+        this.subtype.add(SubType.AZRA);
+        this.subtype.add(SubType.WARRIOR);
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(2);
+
+        // When Azra Bladeseeker enters the battlefield, each player on your team may discard a card, then each player who discarded a card this way draws a card.
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new AzraBladeseekerEffect(), false));
+    }
+
+    public AzraBladeseeker(final AzraBladeseeker card) {
+        super(card);
+    }
+
+    @Override
+    public AzraBladeseeker copy() {
+        return new AzraBladeseeker(this);
+    }
+}
+
+class AzraBladeseekerEffect extends OneShotEffect {
+
+    AzraBladeseekerEffect() {
+        super(Outcome.Benefit);
+        this.staticText = "each player on your team may discard a card, then each player who discarded a card this way draws a card";
+    }
+
+    AzraBladeseekerEffect(final AzraBladeseekerEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public AzraBladeseekerEffect copy() {
+        return new AzraBladeseekerEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        List<PlayerCard> playerCardList = new ArrayList<>();
+        for (UUID playerId : game.getState().getPlayersInRange(source.getControllerId(), game)) {
+            Player player = game.getPlayer(playerId);
+            if (player == null
+                    || player.hasOpponent(source.getControllerId(), game)
+                    || player.getHand().isEmpty()
+                    || !player.chooseUse(Outcome.DrawCard, "Discard a card?", source, game)) {
+                continue;
+            }
+            Target target = new TargetDiscard(playerId);
+            if (target.choose(Outcome.DrawCard, playerId, source.getSourceId(), game)) {
+                Card card = game.getCard(target.getFirstTarget());
+                if (card != null) {
+                    playerCardList.add(new PlayerCard(player, card));
+                }
+            }
+        }
+        for (PlayerCard playerCard : playerCardList) {
+            if (playerCard.getPlayer().discard(playerCard.getCard(), source, game)) {
+                playerCard.getPlayer().drawCards(1, game);
+            }
+        }
+        return true;
+    }
+
+    class PlayerCard {
+
+        private final Player player;
+        private final Card card;
+
+        private PlayerCard(Player player, Card card) {
+            this.player = player;
+            this.card = card;
+        }
+
+        public Player getPlayer() {
+            return player;
+        }
+
+        public Card getCard() {
+            return card;
+        }
+    }
+}

Mage.Sets/src/mage/cards/a/AzraOddsmaker.java

@@ -0,0 +1,167 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.a;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.MageObjectReference;
+import mage.abilities.Ability;
+import mage.abilities.DelayedTriggeredAbility;
+import mage.abilities.common.BeginningOfCombatTriggeredAbility;
+import mage.abilities.costs.Cost;
+import mage.abilities.costs.common.DiscardCardCost;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.constants.SubType;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.TargetController;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.mageobject.MageObjectReferencePredicate;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class AzraOddsmaker extends CardImpl {
+
+    public AzraOddsmaker(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}{R}");
+
+        this.subtype.add(SubType.AZRA);
+        this.subtype.add(SubType.WARRIOR);
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(3);
+
+        // At the beginning of combat on your turn, you may discard a card. If you do, choose a creature. Whenever that creature deals combat damage to a player this turn, you draw two cards.
+        this.addAbility(new BeginningOfCombatTriggeredAbility(new AzraOddsmakerEffect(), TargetController.YOU, true));
+    }
+
+    public AzraOddsmaker(final AzraOddsmaker card) {
+        super(card);
+    }
+
+    @Override
+    public AzraOddsmaker copy() {
+        return new AzraOddsmaker(this);
+    }
+}
+
+class AzraOddsmakerEffect extends OneShotEffect {
+
+    AzraOddsmakerEffect() {
+        super(Outcome.Benefit);
+        this.staticText = "discard a card. If you do, choose a creature. Whenever that creature deals combat damage to a player this turn, you draw two cards";
+    }
+
+    AzraOddsmakerEffect(final AzraOddsmakerEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public AzraOddsmakerEffect copy() {
+        return new AzraOddsmakerEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player player = game.getPlayer(source.getControllerId());
+        if (player == null) {
+            return false;
+        }
+        Cost cost = new DiscardCardCost();
+        Permanent permanent = null;
+        if (cost.canPay(source, source.getSourceId(), source.getControllerId(), game)
+                && cost.pay(source, game, source.getSourceId(), source.getControllerId(), true)) {
+            TargetCreaturePermanent target = new TargetCreaturePermanent();
+            target.setNotTarget(true);
+            if (player.choose(Outcome.DrawCard, target, source.getSourceId(), game)) {
+                permanent = game.getPermanent(target.getFirstTarget());
+            }
+        }
+        if (permanent == null) {
+            return false;
+        }
+        FilterCreaturePermanent filter = new FilterCreaturePermanent();
+        filter.add(new MageObjectReferencePredicate(new MageObjectReference(permanent, game)));
+        game.addDelayedTriggeredAbility(new AzraOddsmakerDelayedTriggeredAbility(filter, permanent.getName()), source);
+        return true;
+    }
+}
+
+class AzraOddsmakerDelayedTriggeredAbility extends DelayedTriggeredAbility {
+
+    private final FilterCreaturePermanent filter;
+    private final String creatureName;
+
+    AzraOddsmakerDelayedTriggeredAbility(FilterCreaturePermanent filter, String creatureName) {
+        super(new DrawCardSourceControllerEffect(2), Duration.EndOfTurn, false);
+        this.filter = filter;
+        this.creatureName = creatureName;
+    }
+
+    AzraOddsmakerDelayedTriggeredAbility(final AzraOddsmakerDelayedTriggeredAbility ability) {
+        super(ability);
+        this.filter = ability.filter;
+        this.creatureName = ability.creatureName;
+    }
+
+    @Override
+    public AzraOddsmakerDelayedTriggeredAbility copy() {
+        return new AzraOddsmakerDelayedTriggeredAbility(this);
+    }
+
+    @Override
+    public boolean checkEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.DAMAGED_PLAYER;
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        if (event.getFlag()) {
+            Permanent permanent = game.getPermanent(event.getSourceId());
+            if (permanent != null && filter.match(permanent, game)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String getRule() {
+        return "Whenever " + creatureName + " deals damage to a player this turn, you draw two cards";
+    }
+}

Mage.Sets/src/mage/cards/b/BelbesPortal.java

@@ -34,7 +34,7 @@ import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.common.ChooseCreatureTypeEffect;
-import mage.abilities.effects.common.PutPermanentOnBattlefieldEffect;
+import mage.abilities.effects.common.PutCardFromHandOntoBattlefieldEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
@@ -58,7 +58,7 @@ public final class BelbesPortal extends CardImpl {
         FilterCreatureCard filter = new FilterCreatureCard("a creature card of the chosen type");
         filter.add(new ChosenSubtypePredicate(this.getId()));
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
-                new PutPermanentOnBattlefieldEffect(filter),
+                new PutCardFromHandOntoBattlefieldEffect(filter),
                 new ManaCostsImpl("{3}"));
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);

Mage.Sets/src/mage/cards/b/BeneathTheSands.java

@@ -48,7 +48,7 @@ public final class BeneathTheSands extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{G}");
 
         // Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library.
-        this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_BASIC_LAND_CARD), true, true));
+        this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true));
 
         // Cycling {2}
         this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}")));

Mage.Sets/src/mage/cards/b/BlaringCaptain.java

@@ -0,0 +1,78 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.b;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.AttacksTriggeredAbility;
+import mage.abilities.effects.common.continuous.BoostAllEffect;
+import mage.abilities.keyword.PartnerWithAbility;
+import mage.constants.SubType;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.permanent.AttackingPredicate;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class BlaringCaptain extends CardImpl {
+
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(SubType.WARRIOR, "attacking Warriors");
+
+    static {
+        filter.add(new AttackingPredicate());
+    }
+
+    public BlaringCaptain(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}");
+
+        this.subtype.add(SubType.AZRA);
+        this.subtype.add(SubType.WARRIOR);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(2);
+
+        // Partner with Blaring Recruiter (When this creature enters the battlefield, target player may put Blaring Recruiter into their hand from their library, then shuffle.)
+        this.addAbility(new PartnerWithAbility("Blaring Recruiter"));
+
+        // Whenever Blaring Captain attacks, attacking Warriors get +1/+1 until end of turn.
+        this.addAbility(new AttacksTriggeredAbility(new BoostAllEffect(1, 1, Duration.EndOfTurn, filter, false), false));
+    }
+
+    public BlaringCaptain(final BlaringCaptain card) {
+        super(card);
+    }
+
+    @Override
+    public BlaringCaptain copy() {
+        return new BlaringCaptain(this);
+    }
+}

Mage.Sets/src/mage/cards/b/BlaringRecruiter.java

@@ -0,0 +1,71 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.b;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.keyword.PartnerWithAbility;
+import mage.constants.SubType;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.game.permanent.token.WarriorToken;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class BlaringRecruiter extends CardImpl {
+
+    public BlaringRecruiter(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}");
+
+        this.subtype.add(SubType.ELF);
+        this.subtype.add(SubType.WARRIOR);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(2);
+
+        // Partner with Blaring Captain (When this creature enters the battlefield, target player may put Blaring Captain into their hand from their library, then shuffle.)
+        this.addAbility(new PartnerWithAbility("Blaring Captain"));
+
+        // {2}{W}: Create a 1/1 white Warrior creature token.
+        this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new WarriorToken()), new ManaCostsImpl("{2}{W}")));
+    }
+
+    public BlaringRecruiter(final BlaringRecruiter card) {
+        super(card);
+    }
+
+    @Override
+    public BlaringRecruiter copy() {
+        return new BlaringRecruiter(this);
+    }
+}

Mage.Sets/src/mage/cards/b/BlightedWoodland.java

@@ -57,7 +57,7 @@ public final class BlightedWoodland extends CardImpl {
 
         // {3}{G}, {T}, Sacrifice Blighted Woodland: Search your library for up to two basic land cards and put them onto the battlefield tapped. Then shuffle your library.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
-                new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 2, StaticFilters.FILTER_BASIC_LAND_CARD), true, true),
+                new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 2, StaticFilters.FILTER_CARD_BASIC_LAND), true, true),
                 new ManaCostsImpl<>("{3}{G}"));
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());

Mage.Sets/src/mage/cards/b/BlinkmothUrn.java

@@ -51,7 +51,7 @@ class BlinkmothUrnEffect extends OneShotEffect {
 
     public BlinkmothUrnEffect() {
         super(Outcome.PutManaInPool);
-        this.staticText = "if Blinkmoth Urn is untapped, that player adds {1} to their mana pool for each artifact he or she controls";
+        this.staticText = "if Blinkmoth Urn is untapped, that player adds {1} for each artifact he or she controls";
     }
 
     public BlinkmothUrnEffect(final BlinkmothUrnEffect effect) {

Mage.Sets/src/mage/cards/b/BloodbornScoundrels.java

@@ -0,0 +1,76 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.b;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.common.GainLifeEffect;
+import mage.abilities.effects.common.LoseLifeTargetEffect;
+import mage.constants.SubType;
+import mage.abilities.keyword.AssistAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.target.common.TargetOpponent;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class BloodbornScoundrels extends CardImpl {
+
+    public BloodbornScoundrels(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{B}");
+
+        this.subtype.add(SubType.VAMPIRE);
+        this.subtype.add(SubType.ROGUE);
+        this.power = new MageInt(4);
+        this.toughness = new MageInt(4);
+
+        // Assist
+        this.addAbility(new AssistAbility());
+
+        // When Bloodborn Scoundrels enters the battlefield, target opponent loses 2 life and you gain 2 life.
+        Ability ability = new EntersBattlefieldTriggeredAbility(new LoseLifeTargetEffect(2));
+        ability.addEffect(new GainLifeEffect(2).setText("and you gain 2 life"));
+        ability.addTarget(new TargetOpponent());
+        this.addAbility(ability);
+    }
+
+    public BloodbornScoundrels(final BloodbornScoundrels card) {
+        super(card);
+    }
+
+    @Override
+    public BloodbornScoundrels copy() {
+        return new BloodbornScoundrels(this);
+    }
+}
+// greetings, good hunter

Mage.Sets/src/mage/cards/b/BonusRound.java

@@ -0,0 +1,101 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.b;
+
+import java.util.UUID;
+import mage.abilities.DelayedTriggeredAbility;
+import mage.abilities.effects.common.CopyTargetSpellEffect;
+import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.stack.Spell;
+import mage.target.targetpointer.FixedTarget;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class BonusRound extends CardImpl {
+
+    public BonusRound(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{R}{R}");
+
+        // Until end of turn, whenever a player casts an instant or sorcery spell, that player copies it and may choose new targets for the copy.
+        this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new BonusRoundDelayedTriggeredAbility()));
+    }
+
+    public BonusRound(final BonusRound card) {
+        super(card);
+    }
+
+    @Override
+    public BonusRound copy() {
+        return new BonusRound(this);
+    }
+}
+
+class BonusRoundDelayedTriggeredAbility extends DelayedTriggeredAbility {
+
+    public BonusRoundDelayedTriggeredAbility() {
+        super(new CopyTargetSpellEffect(true, true), Duration.EndOfTurn, false);
+    }
+
+    public BonusRoundDelayedTriggeredAbility(final BonusRoundDelayedTriggeredAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public BonusRoundDelayedTriggeredAbility copy() {
+        return new BonusRoundDelayedTriggeredAbility(this);
+    }
+
+    @Override
+    public boolean checkEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.SPELL_CAST;
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        Spell spell = game.getStack().getSpell(event.getTargetId());
+        if (spell != null && (spell.isInstant() || spell.isSorcery())) {
+            this.getEffects().setTargetPointer(new FixedTarget(event.getTargetId()));
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public String getRule() {
+        return "Until end of turn, whenever a player casts an instant or sorcery spell, "
+                + "that player copies it and may choose new targets for the copy";
+    }
+}

Mage.Sets/src/mage/cards/b/BorderlandExplorer.java

@@ -135,7 +135,7 @@ class BorderlandExplorerEffect extends OneShotEffect {
                 if (player != null) {
                     Cards cardsPlayer = cardsToDiscard.get(playerId);
                     if (cardsPlayer != null && !cardsPlayer.isEmpty()) {
-                        TargetCardInLibrary target = new TargetCardInLibrary(0, 1, StaticFilters.FILTER_BASIC_LAND_CARD);
+                        TargetCardInLibrary target = new TargetCardInLibrary(0, 1, StaticFilters.FILTER_CARD_BASIC_LAND);
                         if (player.searchLibrary(target, game)) {
                             if (!target.getTargets().isEmpty()) {
                                 Cards cards = new CardsImpl(target.getTargets());

Mage.Sets/src/mage/cards/b/BorderlandRanger.java

@@ -53,7 +53,7 @@ public final class BorderlandRanger extends CardImpl {
         this.toughness = new MageInt(2);
 
         // When Borderland Ranger enters the battlefield, you may search your library for a basic land card, reveal it, and put it into your hand. If you do, shuffle your library.
-        this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_BASIC_LAND_CARD), true, true), true));
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), true));
     }
 
     public BorderlandRanger(final BorderlandRanger card) {

Mage.Sets/src/mage/cards/b/Bossk.java

@@ -70,7 +70,7 @@ public final class Bossk extends CardImpl {
         this.addAbility(new BosskTriggeredAbility());
 
         // <i>Bounty</i> &mdash; Whenever a creature an opponent controls with a bounty counter on it dies, you may search your library for a basic land card, reveal it, and put it in to your hand. If you do, shuffle your library.
-        this.addAbility(new BountyAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_BASIC_LAND_CARD), true, true), true));
+        this.addAbility(new BountyAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), true));
     }
 
     public Bossk(final Bossk card) {

Mage.Sets/src/mage/cards/b/BoundlessRealms.java

@@ -95,7 +95,7 @@ class BoundlessRealmsEffect extends OneShotEffect {
         filter.add(new ControllerPredicate(TargetController.YOU));
 
         int amount = new PermanentsOnBattlefieldCount(filter).calculate(game, source, this);
-        TargetCardInLibrary target = new TargetCardInLibrary(0, amount, StaticFilters.FILTER_BASIC_LAND_CARD);
+        TargetCardInLibrary target = new TargetCardInLibrary(0, amount, StaticFilters.FILTER_CARD_BASIC_LAND);
         if (controller.searchLibrary(target, game)) {
             controller.moveCards(new CardsImpl(target.getTargets()).getCards(game), Zone.BATTLEFIELD, source, game, true, false, false, null);
         }

Mage.Sets/src/mage/cards/b/BraidsConjurerAdept.java

@@ -30,7 +30,7 @@ package mage.cards.b;
 import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
-import mage.abilities.effects.common.PutPermanentOnBattlefieldEffect;
+import mage.abilities.effects.common.PutCardFromHandOntoBattlefieldEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
@@ -64,7 +64,7 @@ public final class BraidsConjurerAdept extends CardImpl {
         this.toughness = new MageInt(2);
 
         // At the beginning of each player's upkeep, that player may put an artifact, creature, or land card from their hand onto the battlefield.
-        this.addAbility(new BeginningOfUpkeepTriggeredAbility(new PutPermanentOnBattlefieldEffect(filter, true), TargetController.ANY, false));
+        this.addAbility(new BeginningOfUpkeepTriggeredAbility(new PutCardFromHandOntoBattlefieldEffect(filter, true), TargetController.ANY, false));
     }
 
     public BraidsConjurerAdept(final BraidsConjurerAdept card) {

Mage.Sets/src/mage/cards/b/BraidwoodSextant.java

@@ -53,7 +53,7 @@ public final class BraidwoodSextant extends CardImpl {
 
         // {2}, {tap}, Sacrifice Braidwood Sextant: Search your library for a basic land card, reveal that card, and put it into your hand. Then shuffle your library.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, 
-            new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 1, StaticFilters.FILTER_BASIC_LAND_CARD), true, true),
+            new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 1, StaticFilters.FILTER_CARD_BASIC_LAND), true, true),
             new ManaCostsImpl("{2}"));
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());

Mage.Sets/src/mage/cards/b/BrainInAJar.java

@@ -28,6 +28,7 @@
 package mage.cards.b;
 
 import java.util.UUID;
+import mage.MageObjectReference;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.common.RemoveVariableCountersSourceCost;
@@ -114,7 +115,7 @@ class BrainInAJarCastEffect extends OneShotEffect {
                 controller.chooseTarget(outcome, target, source, game);
                 Card card = game.getCard(target.getFirstTarget());
                 if (card != null) {
-                    controller.cast(card.getSpellAbility(), game, true);
+                    controller.cast(card.getSpellAbility(), game, true, new MageObjectReference(source.getSourceObject(game), game));
                 }
             }
             return true;

Mage.Sets/src/mage/cards/b/BrambleSovereign.java

@@ -0,0 +1,116 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.b;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldAllTriggeredAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.CreateTokenCopyTargetEffect;
+import mage.abilities.effects.common.DoIfCostPaid;
+import mage.constants.SubType;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.SetTargetPointer;
+import mage.constants.Zone;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.permanent.TokenPredicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class BrambleSovereign extends CardImpl {
+
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creature");
+
+    static {
+        filter.add(Predicates.not(new TokenPredicate()));
+    }
+
+    public BrambleSovereign(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{G}");
+
+        this.subtype.add(SubType.DRYAD);
+        this.power = new MageInt(4);
+        this.toughness = new MageInt(4);
+
+        // Whenever another nontoken creature enters the battlefield, you may pay {1}{G}. If you do, that creature's controller creates a token that's a copy of that creature.
+        this.addAbility(new EntersBattlefieldAllTriggeredAbility(
+                Zone.BATTLEFIELD,
+                new DoIfCostPaid(new BrambleSovereignEffect(), new ManaCostsImpl("{1}{G}")),
+                filter, false, SetTargetPointer.PERMANENT,
+                "Whenever a nontoken creature enters the battlefield, you may pay {1}{G}. "
+                + "If you do, that creature's controller creates a token that's a copy of that creature."
+        ));
+    }
+
+    public BrambleSovereign(final BrambleSovereign card) {
+        super(card);
+    }
+
+    @Override
+    public BrambleSovereign copy() {
+        return new BrambleSovereign(this);
+    }
+}
+
+class BrambleSovereignEffect extends OneShotEffect {
+
+    BrambleSovereignEffect() {
+        super(Outcome.PutCardInPlay);
+        this.staticText = "its controller creates a token that's a copy of that creature";
+    }
+
+    BrambleSovereignEffect(final BrambleSovereignEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public BrambleSovereignEffect copy() {
+        return new BrambleSovereignEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Permanent permanent = game.getPermanentOrLKIBattlefield(this.getTargetPointer().getFirst(game, source));
+        if (permanent != null) {
+            CreateTokenCopyTargetEffect effect = new CreateTokenCopyTargetEffect(permanent.getControllerId());
+            effect.setTargetPointer(targetPointer);
+            effect.apply(game, source);
+        }
+        return true;
+    }
+}

Mage.Sets/src/mage/cards/b/BriarbridgePatrol.java

@@ -27,12 +27,14 @@
  */
 package mage.cards.b;
 
+import java.util.List;
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.BeginningOfEndStepTriggeredAbility;
 import mage.abilities.common.DealsDamageToOneOrMoreCreaturesTriggeredAbility;
 import mage.abilities.condition.Condition;
-import mage.abilities.effects.common.PutPermanentOnBattlefieldEffect;
+import mage.abilities.effects.common.PutCardFromHandOntoBattlefieldEffect;
 import mage.abilities.effects.keyword.InvestigateEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -40,14 +42,11 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.TargetController;
 import mage.constants.Zone;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.watchers.common.PermanentsSacrificedWatcher;
 
-import java.util.List;
-import java.util.UUID;
-
 /**
  * @author LevelX2
  */
@@ -62,7 +61,7 @@ public final class BriarbridgePatrol extends CardImpl {
         // Whenever Briarbridge Patrol deals damage to one or more creatures, investigate (Create a colorless Clue artifact token with "2, Sacrifice this artifact: Draw a card.").
         this.addAbility(new DealsDamageToOneOrMoreCreaturesTriggeredAbility(new InvestigateEffect(), false, false, false));
         // At the beginning of each end step, if you sacrificed three or more Clues this turn, you may put a creature card from your hand onto the battlefield.
-        this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new PutPermanentOnBattlefieldEffect(new FilterCreatureCard("a creature card")), TargetController.ANY,
+        this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_CREATURE_A), TargetController.ANY,
                 BriarbridgePatrolCondition.instance, true), new PermanentsSacrificedWatcher());
 
     }
@@ -104,4 +103,4 @@ enum BriarbridgePatrolCondition implements Condition {
         return "if you sacrificed three or more Clues this turn";
     }
 
-    }
+}

Mage.Sets/src/mage/cards/b/Brightling.java

@@ -0,0 +1,138 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.b;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.mana.ColoredManaCost;
+import mage.abilities.costs.mana.GenericManaCost;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.ReturnToHandSourceEffect;
+import mage.abilities.effects.common.continuous.BoostSourceEffect;
+import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
+import mage.abilities.keyword.LifelinkAbility;
+import mage.abilities.keyword.VigilanceAbility;
+import mage.constants.SubType;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.ColoredManaSymbol;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class Brightling extends CardImpl {
+
+    public Brightling(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}{W}");
+
+        this.subtype.add(SubType.SHAPESHIFTER);
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(3);
+
+        // {W}: Brightling gains vigilance until end of turn.
+        this.addAbility(new SimpleActivatedAbility(
+                Zone.BATTLEFIELD,
+                new GainAbilitySourceEffect(
+                        VigilanceAbility.getInstance(),
+                        Duration.EndOfTurn
+                ),
+                new ColoredManaCost(ColoredManaSymbol.W)
+        ));
+
+        // {W}: Brightling gains lifelink until end of turn.
+        this.addAbility(new SimpleActivatedAbility(
+                Zone.BATTLEFIELD,
+                new GainAbilitySourceEffect(
+                        LifelinkAbility.getInstance(),
+                        Duration.EndOfTurn
+                ),
+                new ColoredManaCost(ColoredManaSymbol.W)
+        ));
+
+        // {W}: Return Brightling to its owner's hand.
+        this.addAbility(new SimpleActivatedAbility(
+                Zone.BATTLEFIELD,
+                new ReturnToHandSourceEffect(true),
+                new ColoredManaCost(ColoredManaSymbol.W)
+        ));
+
+        // {1}: Brightling gets +1/-1 or -1/+1 until end of turn.
+        this.addAbility(new SimpleActivatedAbility(
+                Zone.BATTLEFIELD,
+                new BrightlingEffect(),
+                new GenericManaCost(1)
+        ));
+    }
+
+    public Brightling(final Brightling card) {
+        super(card);
+    }
+
+    @Override
+    public Brightling copy() {
+        return new Brightling(this);
+    }
+}
+
+class BrightlingEffect extends OneShotEffect {
+
+    BrightlingEffect() {
+        super(Outcome.BoostCreature);
+        this.staticText = "{this} gets +1/-1 or -1/+1 until end of turn";
+    }
+
+    BrightlingEffect(final BrightlingEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public BrightlingEffect copy() {
+        return new BrightlingEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player player = game.getPlayer(source.getControllerId());
+        Permanent permanent = game.getPermanent(source.getSourceId());
+        if (player == null || permanent == null) {
+            return false;
+        }
+        int boost = (player.chooseUse(outcome, "Give +1/-1 or -1/+1?", null, "+1/-1", "-1/+1", source, game) ? 1 : -1);
+        return new BoostSourceEffect(boost, -1 * boost, Duration.EndOfTurn).apply(game, source);
+    }
+}

Mage.Sets/src/mage/cards/b/BrilliantUltimatum.java

@@ -31,6 +31,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 import mage.MageObject;
+import mage.MageObjectReference;
 import mage.abilities.Ability;
 import mage.abilities.effects.OneShotEffect;
 import mage.cards.*;
@@ -50,7 +51,7 @@ import mage.target.common.TargetOpponent;
 public final class BrilliantUltimatum extends CardImpl {
 
     public BrilliantUltimatum(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{W}{W}{U}{U}{U}{B}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{W}{W}{U}{U}{U}{B}{B}");
 
         // Exile the top five cards of your library. An opponent separates those cards into two piles. You may play any number of cards from one of those piles without paying their mana costs.
         this.getSpellAbility().addEffect(new BrilliantUltimatumEffect());
@@ -136,7 +137,7 @@ class BrilliantUltimatumEffect extends OneShotEffect {
                 TargetCard targetExiledCard = new TargetCard(Zone.EXILED, new FilterCard());
                 if (controller.chooseTarget(Outcome.PlayForFree, selectedPile, targetExiledCard, source, game)) {
                     Card card = selectedPile.get(targetExiledCard.getFirstTarget(), game);
-                    if (controller.playCard(card, game, true, true)) {
+                    if (controller.playCard(card, game, true, true, new MageObjectReference(source.getSourceObject(game), game))) {
                         selectedPileCards.remove(card);
                         selectedPile.remove(card);
                     }

Mage.Sets/src/mage/cards/b/BringDown.java

@@ -0,0 +1,72 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.b;
+
+import java.util.UUID;
+import mage.abilities.effects.common.DestroyTargetEffect;
+import mage.abilities.keyword.AssistAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.ComparisonType;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.mageobject.PowerPredicate;
+import mage.target.TargetPermanent;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class BringDown extends CardImpl {
+
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 4 or greater");
+
+    static {
+        filter.add(new PowerPredicate(ComparisonType.MORE_THAN, 3));
+    }
+
+    public BringDown(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{W}");
+
+        // Assist
+        this.addAbility(new AssistAbility());
+
+        // Destroy target creature with power 4 or greater.
+        this.getSpellAbility().addEffect(new DestroyTargetEffect());
+        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+    }
+
+    public BringDown(final BringDown card) {
+        super(card);
+    }
+
+    @Override
+    public BringDown copy() {
+        return new BringDown(this);
+    }
+}

Mage.Sets/src/mage/cards/b/BringToLight.java

@@ -28,6 +28,7 @@
 package mage.cards.b;
 
 import java.util.UUID;
+import mage.MageObjectReference;
 import mage.abilities.Ability;
 import mage.abilities.dynamicvalue.common.ColorsOfManaSpentToCastCount;
 import mage.abilities.effects.OneShotEffect;
@@ -54,7 +55,7 @@ import org.apache.log4j.Logger;
 public final class BringToLight extends CardImpl {
 
     public BringToLight(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{G}{U}");
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{G}{U}");
 
         // <i>Converge</i>-Search your library for a creature, instant, or sorcery card with converted mana
         // cost less than or equal to the number of colors of mana spent to cast Bring to Light, exile that card,
@@ -108,7 +109,7 @@ class BringToLightEffect extends OneShotEffect {
             if (card != null) {
                 if (controller.chooseUse(outcome, "Cast " + card.getName() + " without paying its mana cost?", source, game)) {
                     if (card.getSpellAbility() != null) {
-                        controller.cast(card.getSpellAbility(), game, true);
+                        controller.cast(card.getSpellAbility(), game, true, new MageObjectReference(source.getSourceObject(game), game));
                     } else {
                         Logger.getLogger(BringToLightEffect.class).error("Bring to Light: spellAbility == null " + card.getName());
                     }

Mage.Sets/src/mage/cards/b/BrokenBond.java

@@ -30,7 +30,7 @@ package mage.cards.b;
 import java.util.UUID;
 
 import mage.abilities.effects.common.DestroyTargetEffect;
-import mage.abilities.effects.common.PutLandFromHandOntoBattlefieldEffect;
+import mage.abilities.effects.common.PutCardFromHandOntoBattlefieldEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
@@ -49,7 +49,7 @@ public final class BrokenBond extends CardImpl {
         // Destroy target artifact or enchantment. You may put a land card from your hand onto the battlefield.
         this.getSpellAbility().addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addEffect(new PutLandFromHandOntoBattlefieldEffect());
+        this.getSpellAbility().addEffect(new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_LAND_A));
     }
 
     public BrokenBond(final BrokenBond card) {

Mage.Sets/src/mage/cards/b/BubblingMuck.java

@@ -56,7 +56,7 @@ public final class BubblingMuck extends CardImpl {
     public BubblingMuck(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{B}");
 
-        // Until end of turn, whenever a player taps a Swamp for mana, that player adds {B} to their mana pool.
+        // Until end of turn, whenever a player taps a Swamp for mana, that player adds {B}.
         this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new BubblingMuckTriggeredAbility()));
     }
 
@@ -111,6 +111,6 @@ class BubblingMuckTriggeredAbility extends DelayedTriggeredManaAbility {
 
     @Override
     public String getRule() {
-        return "Until end of turn, whenever a player taps a Swamp for mana, that player adds {B} to their mana pool";
+        return "Until end of turn, whenever a player taps a Swamp for mana, that player adds {B}";
     }
 }

Mage.Sets/src/mage/cards/b/BudokaGardener.java

@@ -35,7 +35,6 @@ import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.FlipSourceEffect;
-import mage.abilities.effects.common.PutLandFromHandOntoBattlefieldEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
@@ -44,10 +43,11 @@ import mage.filter.common.FilterControlledPermanent;
 import mage.game.Game;
 import mage.game.permanent.token.DokaiWeaverofLifeToken;
 import mage.game.permanent.token.TokenImpl;
-import mage.game.permanent.token.Token;
 import mage.players.Player;
 
 import java.util.UUID;
+import mage.abilities.effects.common.PutCardFromHandOntoBattlefieldEffect;
+import mage.filter.StaticFilters;
 
 /**
  * @author Loki
@@ -64,7 +64,7 @@ public final class BudokaGardener extends CardImpl {
         this.flipCardName = "Dokai, Weaver of Life";
 
         // {T}: You may put a land card from your hand onto the battlefield. If you control ten or more lands, flip Budoka Gardener.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLandFromHandOntoBattlefieldEffect(), new TapSourceCost());
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_LAND_A), new TapSourceCost());
         ability.addEffect(new BudokaGardenerEffect());
         this.addAbility(ability);
     }
@@ -128,6 +128,7 @@ class DokaiWeaverofLife extends TokenImpl {
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);
     }
+
     public DokaiWeaverofLife(final DokaiWeaverofLife token) {
         super(token);
     }

Mage.Sets/src/mage/cards/b/BullRushBruiser.java

@@ -0,0 +1,81 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.b;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.AttacksTriggeredAbility;
+import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
+import mage.abilities.decorator.ConditionalTriggeredAbility;
+import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
+import mage.abilities.keyword.FirstStrikeAbility;
+import mage.constants.SubType;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.filter.common.FilterTeamPermanent;
+import mage.filter.predicate.permanent.AnotherPredicate;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class BullRushBruiser extends CardImpl {
+
+    private static final FilterTeamPermanent filter = new FilterTeamPermanent(SubType.WARRIOR, "another Warrior");
+
+    static {
+        filter.add(new AnotherPredicate());
+    }
+
+    public BullRushBruiser(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}");
+
+        this.subtype.add(SubType.MINOTAUR);
+        this.subtype.add(SubType.WARRIOR);
+        this.power = new MageInt(4);
+        this.toughness = new MageInt(3);
+
+        // Whenever Bull-Rush Bruiser attacks, if your team controls another Warrior, Bull-Rush Bruiser gains first strike until end of turn.
+        this.addAbility(new ConditionalTriggeredAbility(
+                new AttacksTriggeredAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), false),
+                new PermanentsOnTheBattlefieldCondition(filter),
+                "Whenever {this} attacks, if your team controls another Warrior, "
+                + "{this} gains first strike until end of turn."
+        ));
+    }
+
+    public BullRushBruiser(final BullRushBruiser card) {
+        super(card);
+    }
+
+    @Override
+    public BullRushBruiser copy() {
+        return new BullRushBruiser(this);
+    }
+}

Mage.Sets/src/mage/cards/b/Burgeoning.java

@@ -29,11 +29,12 @@ package mage.cards.b;
 
 import java.util.UUID;
 import mage.abilities.TriggeredAbilityImpl;
-import mage.abilities.effects.common.PutLandFromHandOntoBattlefieldEffect;
+import mage.abilities.effects.common.PutCardFromHandOntoBattlefieldEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Zone;
+import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
@@ -45,7 +46,7 @@ import mage.game.permanent.Permanent;
 public final class Burgeoning extends CardImpl {
 
     public Burgeoning(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{G}");
 
         // Whenever an opponent plays a land, you may put a land card from your hand onto the battlefield.
         this.addAbility(new BurgeoningTriggeredAbility());
@@ -61,10 +62,10 @@ public final class Burgeoning extends CardImpl {
     }
 }
 
-
 class BurgeoningTriggeredAbility extends TriggeredAbilityImpl {
+
     BurgeoningTriggeredAbility() {
-        super(Zone.BATTLEFIELD, new PutLandFromHandOntoBattlefieldEffect());
+        super(Zone.BATTLEFIELD, new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_LAND_A));
     }
 
     BurgeoningTriggeredAbility(BurgeoningTriggeredAbility ability) {

Mage.Sets/src/mage/cards/b/BurnishedHart.java

@@ -59,7 +59,7 @@ public final class BurnishedHart extends CardImpl {
         // {3}, Sacrifice Burnished Hart: Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle your library.
         Ability ability = new SimpleActivatedAbility(
                 Zone.BATTLEFIELD,
-                new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0,2, StaticFilters.FILTER_BASIC_LAND_CARD), true, true),
+                new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0,2, StaticFilters.FILTER_CARD_BASIC_LAND), true, true),
                 new GenericManaCost(3));
         ability.addCost(new SacrificeSourceCost());
         this.addAbility(ability);

Mage.Sets/src/mage/cards/c/CaravanVigil.java

@@ -88,7 +88,7 @@ class CaravanVigilEffect extends OneShotEffect {
         Player controller = game.getPlayer(source.getControllerId());
         MageObject sourceObject = source.getSourceObject(game);
         if (sourceObject != null && controller != null) {
-            TargetCardInLibrary target = new TargetCardInLibrary(StaticFilters.FILTER_BASIC_LAND_CARD);
+            TargetCardInLibrary target = new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND);
             if (controller.searchLibrary(target, game)) {
                 Card card = controller.getLibrary().getCard(target.getFirstTarget(), game);
                 if (card != null) {

Mage.Sets/src/mage/cards/c/CentaurRootcaster.java

@@ -54,7 +54,7 @@ public final class CentaurRootcaster extends CardImpl {
 
         // Whenever Centaur Rootcaster deals combat damage to a player, you may search your library for a basic land card and put that card onto the battlefield tapped. If you do, shuffle your library.
         this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(
-                new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 1, StaticFilters.FILTER_BASIC_LAND_CARD), true, true),
+                new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 1, StaticFilters.FILTER_CARD_BASIC_LAND), true, true),
                 true));
     }
 

Mage.Sets/src/mage/cards/c/ChakramRetriever.java

@@ -0,0 +1,79 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.c;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SpellCastControllerTriggeredAbility;
+import mage.abilities.condition.common.MyTurnCondition;
+import mage.abilities.decorator.ConditionalTriggeredAbility;
+import mage.abilities.effects.common.UntapTargetEffect;
+import mage.abilities.keyword.PartnerWithAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class ChakramRetriever extends CardImpl {
+
+    public ChakramRetriever(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{U}");
+
+        this.subtype.add(SubType.ELEMENTAL);
+        this.subtype.add(SubType.HOUND);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(4);
+
+        // Partner with Chakram Slinger (When this creature enters the battlefield, target player may put Chakram Slinger into their hand from their library, then shuffle.)
+        this.addAbility(new PartnerWithAbility("Chakram Slinger"));
+
+        // Whenever you cast a spell during your turn, untap target creature.
+        Ability ability = new ConditionalTriggeredAbility(
+                new SpellCastControllerTriggeredAbility(new UntapTargetEffect(), false),
+                MyTurnCondition.instance,
+                "Whenever you cast a spell during your turn, untap target creature."
+        );
+        ability.addTarget(new TargetCreaturePermanent());
+        this.addAbility(ability);
+    }
+
+    public ChakramRetriever(final ChakramRetriever card) {
+        super(card);
+    }
+
+    @Override
+    public ChakramRetriever copy() {
+        return new ChakramRetriever(this);
+    }
+}

Mage.Sets/src/mage/cards/c/ChakramSlinger.java

@@ -0,0 +1,76 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.c;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.DamageTargetEffect;
+import mage.abilities.keyword.PartnerWithAbility;
+import mage.constants.SubType;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.target.common.TargetPlayerOrPlaneswalker;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class ChakramSlinger extends CardImpl {
+
+    public ChakramSlinger(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{R}");
+
+        this.subtype.add(SubType.HUMAN);
+        this.subtype.add(SubType.WARRIOR);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(4);
+
+        // Partner with Chakram Retriever (When this creature enters the battlefield, target player may put Chakram Retriever into their hand from their library, then shuffle.)
+        this.addAbility(new PartnerWithAbility("Chakram Retriever"));
+
+        // {R}, {T}: Chakram Slinger deals 2 damage to target player or planeswalker.
+        Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl("{R}"));
+        ability.addCost(new TapSourceCost());
+        ability.addTarget(new TargetPlayerOrPlaneswalker());
+        this.addAbility(ability);
+    }
+
+    public ChakramSlinger(final ChakramSlinger card) {
+        super(card);
+    }
+
+    @Override
+    public ChakramSlinger copy() {
+        return new ChakramSlinger(this);
+    }
+}