diff --git a/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java b/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java index 32d15b7b207..6364c83f9b9 100644 --- a/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java +++ b/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java @@ -1260,7 +1260,7 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg for (List> gridRow : cardGrid) { for (List stack : gridRow) { for (CardView card : stack) { - boolean s = card.isSelected() | card.getCardTypes().contains(cardType); + boolean s = card.isSelected() || card.getCardTypes().contains(cardType); card.setSelected(s); cardViews.get(card.getId()).update(card); } diff --git a/Mage.Client/src/main/java/mage/client/components/MageRoundPane.java b/Mage.Client/src/main/java/mage/client/components/MageRoundPane.java index 39e968074df..7d5e2c1fd08 100644 --- a/Mage.Client/src/main/java/mage/client/components/MageRoundPane.java +++ b/Mage.Client/src/main/java/mage/client/components/MageRoundPane.java @@ -36,7 +36,7 @@ public class MageRoundPane extends JPanel { IMAGE_CACHE = ImageCaches.register(new MapMaker().softValues().makeComputingMap((Function) key -> createImage(key))); } - private final static class ShadowKey { + private static final class ShadowKey { final int width; final int height; @@ -76,7 +76,7 @@ public class MageRoundPane extends JPanel { } } - private final static class Key { + private static final class Key { final int width; final int height; diff --git a/Mage.Client/src/main/java/mage/client/components/ext/dlg/DialogManager.java b/Mage.Client/src/main/java/mage/client/components/ext/dlg/DialogManager.java index 329ff3ec0ed..89cf45f1c1a 100644 --- a/Mage.Client/src/main/java/mage/client/components/ext/dlg/DialogManager.java +++ b/Mage.Client/src/main/java/mage/client/components/ext/dlg/DialogManager.java @@ -20,7 +20,7 @@ import java.util.UUID; public class DialogManager extends JComponent implements MouseListener, MouseMotionListener { - private final static Map dialogManagers = new HashMap<>(); + private static final Map dialogManagers = new HashMap<>(); public static DialogManager getManager(UUID gameId) { if (!dialogManagers.containsKey(gameId)) { diff --git a/Mage.Client/src/main/java/mage/client/components/ext/dlg/DlgParams.java b/Mage.Client/src/main/java/mage/client/components/ext/dlg/DlgParams.java index 0eeac96eb3a..f4ad229f93e 100644 --- a/Mage.Client/src/main/java/mage/client/components/ext/dlg/DlgParams.java +++ b/Mage.Client/src/main/java/mage/client/components/ext/dlg/DlgParams.java @@ -8,6 +8,7 @@ import mage.view.CardsView; import java.awt.*; import java.util.ArrayList; import java.util.HashSet; +import java.util.Set; import java.util.UUID; /** @@ -26,9 +27,9 @@ public class DlgParams { private int playerID; private CardsView cards; - private ArrayList stringList; + private java.util.List stringList; //private ArrayList deckList; - private ArrayList objectList; + private java.util.List objectList; private String title; private int opponentID; @@ -38,7 +39,7 @@ public class DlgParams { boolean isAI = false; - public HashSet manaChoices = new HashSet<>(); + public Set manaChoices = new HashSet<>(); public int getPlayerID() { return playerID; @@ -74,11 +75,11 @@ public class DlgParams { this.message = message; } - public HashSet getManaChoices() { + public Set getManaChoices() { return manaChoices; } - public void setManaChoices(HashSet manaChoices) { + public void setManaChoices(Set manaChoices) { this.manaChoices = manaChoices; } @@ -98,7 +99,7 @@ public class DlgParams { this.isChooseAbility = isChooseAbility; } - public ArrayList getStringList() { + public java.util.List getStringList() { return stringList; } @@ -114,7 +115,7 @@ public class DlgParams { this.deckList = deckList; }*/ - public ArrayList getObjectList() { + public java.util.List getObjectList() { return objectList; } diff --git a/Mage.Client/src/main/java/mage/client/components/ext/dlg/IDialogPanel.java b/Mage.Client/src/main/java/mage/client/components/ext/dlg/IDialogPanel.java index 5720341ee97..f143ea9ea92 100644 --- a/Mage.Client/src/main/java/mage/client/components/ext/dlg/IDialogPanel.java +++ b/Mage.Client/src/main/java/mage/client/components/ext/dlg/IDialogPanel.java @@ -10,7 +10,7 @@ import java.awt.*; /** * @author mw, noxx */ -abstract public class IDialogPanel extends JXPanel { +public abstract class IDialogPanel extends JXPanel { private DlgParams params; private Dimension cardDimension; diff --git a/Mage.Client/src/main/java/mage/client/components/ext/dlg/impl/ChoiceDialog.java b/Mage.Client/src/main/java/mage/client/components/ext/dlg/impl/ChoiceDialog.java index 938a99483ab..13594995e7e 100644 --- a/Mage.Client/src/main/java/mage/client/components/ext/dlg/impl/ChoiceDialog.java +++ b/Mage.Client/src/main/java/mage/client/components/ext/dlg/impl/ChoiceDialog.java @@ -50,11 +50,12 @@ public class ChoiceDialog extends IDialogPanel { private boolean isCancelStopsPlaying = true; private final DlgParams params; - + private final String title; /** * This is the default constructor + * * @param params * @param title */ @@ -130,18 +131,18 @@ public class ChoiceDialog extends IDialogPanel { return; } - ArrayList toRemove = new ArrayList<>(); + java.util.List toRemove = new ArrayList<>(); for (int i = getComponentCount() - 1; i > 0; i--) { Component o = getComponent(i); if (o instanceof MageCard) { toRemove.add(o); } } - for (int i = 0; i < toRemove.size(); i++) { - remove(toRemove.get(i)); + for (Component aToRemove : toRemove) { + remove(aToRemove); } - ArrayList cardList = new ArrayList<>(cards.values()); + java.util.List cardList = new ArrayList<>(cards.values()); int width = SettingsManager.instance.getCardSize().width; int height = SettingsManager.instance.getCardSize().height; @@ -163,7 +164,7 @@ public class ChoiceDialog extends IDialogPanel { CardView card = cardList.get(i); MageCard cardImg = Plugins.instance.getMageCard(card, bigCard, getCardDimension(), gameId, true, true); - cardImg.setLocation(dx, dy + j*(height + 30)); + cardImg.setLocation(dx, dy + j * (height + 30)); add(cardImg); dx += (width + 20); @@ -237,11 +238,8 @@ public class ChoiceDialog extends IDialogPanel { int h = getDlgParams().rect.height - 90; jButtonNextPage.setBounds(new Rectangle(w / 2 + 45, h - 50, 60, 60)); - if (maxPages > 1) { - jButtonNextPage.setVisible(true); - } else { - jButtonNextPage.setVisible(false); - } + jButtonNextPage.setVisible(maxPages > 1); + jButtonNextPage.setObserver(new Command() { private static final long serialVersionUID = -3174360416099554104L; diff --git a/Mage.Client/src/main/java/mage/client/components/tray/MageTray.java b/Mage.Client/src/main/java/mage/client/components/tray/MageTray.java index 43810b3e3e9..4bd3166cbe9 100644 --- a/Mage.Client/src/main/java/mage/client/components/tray/MageTray.java +++ b/Mage.Client/src/main/java/mage/client/components/tray/MageTray.java @@ -78,7 +78,6 @@ public enum MageTray { tray.add(trayIcon); } catch (AWTException e) { log.error("TrayIcon could not be added: ", e); - return; } } catch (Exception e) { diff --git a/Mage.Client/src/main/java/mage/client/deck/generator/DeckGeneratorCMC.java b/Mage.Client/src/main/java/mage/client/deck/generator/DeckGeneratorCMC.java index 16202fa4ff3..412e11eeafb 100644 --- a/Mage.Client/src/main/java/mage/client/deck/generator/DeckGeneratorCMC.java +++ b/Mage.Client/src/main/java/mage/client/deck/generator/DeckGeneratorCMC.java @@ -2,6 +2,7 @@ package mage.client.deck.generator; import java.util.ArrayList; +import java.util.List; public enum DeckGeneratorCMC { @@ -51,11 +52,11 @@ public enum DeckGeneratorCMC { this.poolCMCs40 = CMCs40; } - public ArrayList get40CardPoolCMC() { + public List get40CardPoolCMC() { return this.poolCMCs40; } - public ArrayList get60CardPoolCMC() { + public List get60CardPoolCMC() { return this.poolCMCs60; } diff --git a/Mage.Client/src/main/java/mage/client/deck/generator/RatioAdjustingSliderPanel.java b/Mage.Client/src/main/java/mage/client/deck/generator/RatioAdjustingSliderPanel.java index 21036d93c7b..b01bef149bf 100644 --- a/Mage.Client/src/main/java/mage/client/deck/generator/RatioAdjustingSliderPanel.java +++ b/Mage.Client/src/main/java/mage/client/deck/generator/RatioAdjustingSliderPanel.java @@ -143,7 +143,7 @@ public class RatioAdjustingSliderPanel extends JPanel { private static JLabel createChangingPercentageLabel(final JSlider slider) { - final JLabel label = new JLabel(" " + String.valueOf(slider.getValue()) + '%'); + final JLabel label = new JLabel(" " + slider.getValue() + '%'); slider.addChangeListener(e -> { String value = String.valueOf(slider.getValue()); diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java index 145126d2036..1385d616860 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java @@ -357,9 +357,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene for (int itemIndex : choiseValue) { java.util.List listReceived = ConstructedFormats.getSetsByFormat(x.getElementAt(itemIndex).toString()); - listReceived.stream().filter((item) -> (setCodes.contains(item) == false)).forEachOrdered((item) -> { - setCodes.add(item); - }); + listReceived.stream().filter(item -> !setCodes.contains(item)).forEachOrdered(setCodes::add); } criteria.setCodes(setCodes.toArray(new String[0])); } diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/DeckArea.java b/Mage.Client/src/main/java/mage/client/deckeditor/DeckArea.java index a0b9c92f5f1..d087803205f 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/DeckArea.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/DeckArea.java @@ -55,7 +55,7 @@ public class DeckArea extends javax.swing.JPanel { public int dividerLocationLimited; public int dividerLocationNormal; - private final static Pattern parser = Pattern.compile("([^|]*)\\|([^|]*)\\|([^|]*)\\|([^|]*)"); + private static final Pattern parser = Pattern.compile("([^|]*)\\|([^|]*)\\|([^|]*)\\|([^|]*)"); public static Settings parse(String s) { Matcher m = parser.matcher(s); diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java index 29ef276b9a7..4bb6aefe8ab 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java @@ -1119,12 +1119,12 @@ class ImportFilter extends FileFilter { ext = s.substring(i + 1).toLowerCase(Locale.ENGLISH); } if (ext != null) { - if (ext.toLowerCase(Locale.ENGLISH).equals("dec") - || ext.toLowerCase(Locale.ENGLISH).equals("mwdeck") - || ext.toLowerCase(Locale.ENGLISH).equals("txt") - || ext.toLowerCase(Locale.ENGLISH).equals("dek") - || ext.toLowerCase(Locale.ENGLISH).equals("cod") - || ext.toLowerCase(Locale.ENGLISH).equals("o8d")) { + if (ext.equalsIgnoreCase("dec") + || ext.equalsIgnoreCase("mwdeck") + || ext.equalsIgnoreCase("txt") + || ext.equalsIgnoreCase("dek") + || ext.equalsIgnoreCase("cod") + || ext.equalsIgnoreCase("o8d")) { return true; } } diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/SortSettingBase.java b/Mage.Client/src/main/java/mage/client/deckeditor/SortSettingBase.java index 59eafa90046..9df3a75a17d 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/SortSettingBase.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/SortSettingBase.java @@ -10,7 +10,7 @@ import mage.client.dialog.PreferencesDialog; public class SortSettingBase extends SortSetting { - private final static SortSettingBase instance = new SortSettingBase(); + private static final SortSettingBase instance = new SortSettingBase(); public static SortSettingBase getInstance() { return instance; diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/SortSettingDeck.java b/Mage.Client/src/main/java/mage/client/deckeditor/SortSettingDeck.java index 17b5956cc06..f520d106f47 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/SortSettingDeck.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/SortSettingDeck.java @@ -10,7 +10,7 @@ import mage.client.dialog.PreferencesDialog; public class SortSettingDeck extends SortSetting { - private final static SortSettingDeck instance = new SortSettingDeck(); + private static final SortSettingDeck instance = new SortSettingDeck(); public static SortSettingDeck getInstance() { return instance; diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/SortSettingDraft.java b/Mage.Client/src/main/java/mage/client/deckeditor/SortSettingDraft.java index 3545eaa77ce..26b4d3cc480 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/SortSettingDraft.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/SortSettingDraft.java @@ -10,7 +10,7 @@ import mage.client.dialog.PreferencesDialog; */ public class SortSettingDraft extends SortSetting { - private final static SortSettingDraft instance = new SortSettingDraft(); + private static final SortSettingDraft instance = new SortSettingDraft(); public static SortSettingDraft getInstance() { return instance; diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java index e227d12d090..6ae066c8164 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java @@ -265,7 +265,7 @@ public class MageBook extends JComponent { public int showTokens() { jLayeredPane.removeAll(); List tokens = getTokens(currentPage, currentSet); - if (tokens != null && tokens.size() > 0) { + if (tokens != null && !tokens.isEmpty()) { int size = tokens.size(); Rectangle rectangle = new Rectangle(); rectangle.translate(OFFSET_X, OFFSET_Y); @@ -295,7 +295,7 @@ public class MageBook extends JComponent { public int showEmblems(int numTokens) { List emblems = getEmblems(currentPage, currentSet, numTokens); int numEmblems = 0; - if (emblems != null && emblems.size() > 0) { + if (emblems != null && !emblems.isEmpty()) { int size = emblems.size(); numEmblems = size; Rectangle rectangle = new Rectangle(); diff --git a/Mage.Client/src/main/java/mage/client/dialog/RandomPacksSelectorDialog.java b/Mage.Client/src/main/java/mage/client/dialog/RandomPacksSelectorDialog.java index da1b709bcfe..ada52f2916c 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/RandomPacksSelectorDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/RandomPacksSelectorDialog.java @@ -25,7 +25,7 @@ public class RandomPacksSelectorDialog extends javax.swing.JDialog { private boolean isRandomDraft; private boolean isRichManDraft; private String title = ""; - public final static String randomDraftDescription = ("The selected packs will be randomly distributed to players. Each player may open different packs. Duplicates will be avoided."); + public static final String randomDraftDescription = ("The selected packs will be randomly distributed to players. Each player may open different packs. Duplicates will be avoided."); public RandomPacksSelectorDialog(boolean isRandomDraft, boolean isRichManDraft) { initComponents(); diff --git a/Mage.Client/src/main/java/mage/client/util/GUISizeHelper.java b/Mage.Client/src/main/java/mage/client/util/GUISizeHelper.java index 6ea1424acc4..3f187e19f40 100644 --- a/Mage.Client/src/main/java/mage/client/util/GUISizeHelper.java +++ b/Mage.Client/src/main/java/mage/client/util/GUISizeHelper.java @@ -23,9 +23,9 @@ import org.mage.card.arcane.CardRenderer; public final class GUISizeHelper { // relate the native image card size to a value of the size scale - final static int CARD_IMAGE_WIDTH = 312; - final static int CARD_IMAGE_HEIGHT = 445; - final static int CARD_IMAG_VALUE = 42; + static final int CARD_IMAGE_WIDTH = 312; + static final int CARD_IMAGE_HEIGHT = 445; + static final int CARD_IMAG_VALUE = 42; public static String basicSymbolSize = "small"; diff --git a/Mage.Client/src/main/java/mage/client/util/ImageCaches.java b/Mage.Client/src/main/java/mage/client/util/ImageCaches.java index cf226804950..2f5fe743456 100644 --- a/Mage.Client/src/main/java/mage/client/util/ImageCaches.java +++ b/Mage.Client/src/main/java/mage/client/util/ImageCaches.java @@ -10,7 +10,7 @@ import java.util.Map; */ public final class ImageCaches { - private final static ArrayList IMAGE_CACHES; + private static final ArrayList IMAGE_CACHES; static { IMAGE_CACHES = new ArrayList<>(); diff --git a/Mage.Client/src/main/java/mage/client/util/TransformedImageCache.java b/Mage.Client/src/main/java/mage/client/util/TransformedImageCache.java index b8abf2e5537..77ad5b8917c 100644 --- a/Mage.Client/src/main/java/mage/client/util/TransformedImageCache.java +++ b/Mage.Client/src/main/java/mage/client/util/TransformedImageCache.java @@ -22,7 +22,7 @@ import java.util.Map; */ public final class TransformedImageCache { - private final static class Key { + private static final class Key { final int width; final int height; diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelComponentImpl.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelComponentImpl.java index d7812ba2aaa..0ffdaddc920 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelComponentImpl.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelComponentImpl.java @@ -78,7 +78,7 @@ public class CardPanelComponentImpl extends CardPanel { private boolean displayTitleAnyway; private boolean displayFullImagePath; - private final static Map IMAGE_CACHE; + private static final Map IMAGE_CACHE; static class Key { diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelRenderImpl.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelRenderImpl.java index 10182f66545..b3e3a495146 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelRenderImpl.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelRenderImpl.java @@ -215,7 +215,7 @@ public class CardPanelRenderImpl extends CardPanel { } // Map of generated images - private final static Map IMAGE_CACHE = new MapMaker().softValues().makeMap(); + private static final Map IMAGE_CACHE = new MapMaker().softValues().makeMap(); // The art image for the card, loaded in from the disk private BufferedImage artImage; diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/GlowText.java b/Mage.Client/src/main/java/org/mage/card/arcane/GlowText.java index bc7ac1617d0..9062ffe6d8d 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/GlowText.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/GlowText.java @@ -28,9 +28,9 @@ public class GlowText extends JLabel { private Color glowColor; private boolean wrap; private int lineCount = 0; - private final static Map IMAGE_CACHE; + private static final Map IMAGE_CACHE; - private final static class Key { + private static final class Key { final int width; final int height; diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java b/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java index 4aea652c0b9..baab2a7858d 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java @@ -63,7 +63,7 @@ import static org.mage.card.arcane.ManaSymbols.getSizedManaSymbol; */ public class ModernCardRenderer extends CardRenderer { - private final static Logger LOGGER = Logger.getLogger(ModernCardRenderer.class); + private static final Logger LOGGER = Logger.getLogger(ModernCardRenderer.class); /////////////////////////////////////////////////////////////////////////// // Textures for modern frame cards diff --git a/Mage.Common/src/main/java/mage/remote/SessionImpl.java b/Mage.Common/src/main/java/mage/remote/SessionImpl.java index 38439c01a5b..2dd201d284c 100644 --- a/Mage.Common/src/main/java/mage/remote/SessionImpl.java +++ b/Mage.Common/src/main/java/mage/remote/SessionImpl.java @@ -54,7 +54,7 @@ public class SessionImpl implements Session { private ServerState serverState; private SessionState sessionState = SessionState.DISCONNECTED; private Connection connection; - private final static int PING_CYCLES = 10; + private static final int PING_CYCLES = 10; private final LinkedList pingTime = new LinkedList<>(); private String pingInfo = ""; private static boolean debugMode = false; diff --git a/Mage.Common/src/main/java/mage/utils/MageVersion.java b/Mage.Common/src/main/java/mage/utils/MageVersion.java index fee5ed1286d..f65978c3331 100644 --- a/Mage.Common/src/main/java/mage/utils/MageVersion.java +++ b/Mage.Common/src/main/java/mage/utils/MageVersion.java @@ -12,13 +12,13 @@ public class MageVersion implements Serializable, Comparable { /** * */ - public final static int MAGE_VERSION_MAJOR = 1; - public final static int MAGE_VERSION_MINOR = 4; - public final static int MAGE_VERSION_PATCH = 33; - public final static String MAGE_EDITION_INFO = ""; // set "-beta" for 1.4.32-betaV0 - public final static String MAGE_VERSION_MINOR_PATCH = "V3"; // default + public static final int MAGE_VERSION_MAJOR = 1; + public static final int MAGE_VERSION_MINOR = 4; + public static final int MAGE_VERSION_PATCH = 33; + public static final String MAGE_EDITION_INFO = ""; // set "-beta" for 1.4.32-betaV0 + public static final String MAGE_VERSION_MINOR_PATCH = "V3"; // default // strict mode - private final static boolean MAGE_VERSION_MINOR_PATCH_MUST_BE_SAME = true; // set true on uncompatible github changes, set false after new major release (after MAGE_VERSION_PATCH changes) + private static final boolean MAGE_VERSION_MINOR_PATCH_MUST_BE_SAME = true; // set true on uncompatible github changes, set false after new major release (after MAGE_VERSION_PATCH changes) private final int major; private final int minor; diff --git a/Mage.Server/src/main/java/mage/server/Session.java b/Mage.Server/src/main/java/mage/server/Session.java index 39475db9237..be7d0357507 100644 --- a/Mage.Server/src/main/java/mage/server/Session.java +++ b/Mage.Server/src/main/java/mage/server/Session.java @@ -30,8 +30,8 @@ import org.jboss.remoting.callback.InvokerCallbackHandler; public class Session { private static final Logger logger = Logger.getLogger(Session.class); - private final static Pattern alphabetsPattern = Pattern.compile("[a-zA-Z]"); - private final static Pattern digitsPattern = Pattern.compile("[0-9]"); + private static final Pattern alphabetsPattern = Pattern.compile("[a-zA-Z]"); + private static final Pattern digitsPattern = Pattern.compile("[0-9]"); private final String sessionId; private UUID userId; diff --git a/Mage.Server/src/main/java/mage/server/draft/DraftSession.java b/Mage.Server/src/main/java/mage/server/draft/DraftSession.java index 1ab6320e97d..d34848fdb10 100644 --- a/Mage.Server/src/main/java/mage/server/draft/DraftSession.java +++ b/Mage.Server/src/main/java/mage/server/draft/DraftSession.java @@ -24,7 +24,7 @@ import org.apache.log4j.Logger; */ public class DraftSession { - protected final static Logger logger = Logger.getLogger(DraftSession.class); + protected static final Logger logger = Logger.getLogger(DraftSession.class); protected final UUID userId; protected final UUID playerId; diff --git a/Mage.Server/src/main/java/mage/server/game/GameSessionWatcher.java b/Mage.Server/src/main/java/mage/server/game/GameSessionWatcher.java index daa075be50c..086a1cc04d1 100644 --- a/Mage.Server/src/main/java/mage/server/game/GameSessionWatcher.java +++ b/Mage.Server/src/main/java/mage/server/game/GameSessionWatcher.java @@ -25,7 +25,7 @@ import java.util.UUID; */ public class GameSessionWatcher { - protected final static Logger logger = Logger.getLogger(GameSessionWatcher.class); + protected static final Logger logger = Logger.getLogger(GameSessionWatcher.class); protected final UUID userId; protected final Game game; diff --git a/Mage.Server/src/main/java/mage/server/tournament/TournamentSession.java b/Mage.Server/src/main/java/mage/server/tournament/TournamentSession.java index c93b8a056fd..33171659910 100644 --- a/Mage.Server/src/main/java/mage/server/tournament/TournamentSession.java +++ b/Mage.Server/src/main/java/mage/server/tournament/TournamentSession.java @@ -21,7 +21,7 @@ import org.apache.log4j.Logger; */ public class TournamentSession { - protected final static Logger logger = Logger.getLogger(TournamentSession.class); + protected static final Logger logger = Logger.getLogger(TournamentSession.class); protected final UUID userId; protected final UUID playerId; diff --git a/Mage.Sets/src/mage/cards/a/AdaptiveAutomaton.java b/Mage.Sets/src/mage/cards/a/AdaptiveAutomaton.java index 1e1341a51e9..7c23ced8ebe 100644 --- a/Mage.Sets/src/mage/cards/a/AdaptiveAutomaton.java +++ b/Mage.Sets/src/mage/cards/a/AdaptiveAutomaton.java @@ -20,7 +20,7 @@ import mage.filter.predicate.permanent.ControllerPredicate; */ public final class AdaptiveAutomaton extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you control of the chosen type"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you control of the chosen type"); static { filter.add(new ControllerPredicate(TargetController.YOU)); diff --git a/Mage.Sets/src/mage/cards/a/AgentOfShauku.java b/Mage.Sets/src/mage/cards/a/AgentOfShauku.java index 974b9bda93f..21093caee9f 100644 --- a/Mage.Sets/src/mage/cards/a/AgentOfShauku.java +++ b/Mage.Sets/src/mage/cards/a/AgentOfShauku.java @@ -25,7 +25,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class AgentOfShauku extends CardImpl { - final static FilterControlledPermanent filter = new FilterControlledLandPermanent("a land"); + static final FilterControlledPermanent filter = new FilterControlledLandPermanent("a land"); public AgentOfShauku(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}"); diff --git a/Mage.Sets/src/mage/cards/a/AltacBloodseeker.java b/Mage.Sets/src/mage/cards/a/AltacBloodseeker.java index 3f6e056f885..b9d6032bfa6 100644 --- a/Mage.Sets/src/mage/cards/a/AltacBloodseeker.java +++ b/Mage.Sets/src/mage/cards/a/AltacBloodseeker.java @@ -25,7 +25,7 @@ import mage.filter.predicate.permanent.ControllerPredicate; */ public final class AltacBloodseeker extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/a/AmrouSeekers.java b/Mage.Sets/src/mage/cards/a/AmrouSeekers.java index 006a78032c2..e9f0358e37b 100644 --- a/Mage.Sets/src/mage/cards/a/AmrouSeekers.java +++ b/Mage.Sets/src/mage/cards/a/AmrouSeekers.java @@ -22,7 +22,7 @@ import mage.filter.predicate.mageobject.ColorPredicate; */ public final class AmrouSeekers extends CardImpl { - private final static FilterCreaturePermanent notArtificatOrWhite = new FilterCreaturePermanent("except by artifact creatures and/or white creatures"); + private static final FilterCreaturePermanent notArtificatOrWhite = new FilterCreaturePermanent("except by artifact creatures and/or white creatures"); static { notArtificatOrWhite.add(Predicates.not( diff --git a/Mage.Sets/src/mage/cards/a/AngelOfSanctions.java b/Mage.Sets/src/mage/cards/a/AngelOfSanctions.java index 2d61c57d491..c6ebd9d003d 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfSanctions.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfSanctions.java @@ -26,7 +26,7 @@ import mage.target.TargetPermanent; */ public final class AngelOfSanctions extends CardImpl { - private final static FilterNonlandPermanent filter = new FilterNonlandPermanent(); + private static final FilterNonlandPermanent filter = new FilterNonlandPermanent(); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/a/AngelsFeather.java b/Mage.Sets/src/mage/cards/a/AngelsFeather.java index 351a64d2bb4..193eeeefb0c 100644 --- a/Mage.Sets/src/mage/cards/a/AngelsFeather.java +++ b/Mage.Sets/src/mage/cards/a/AngelsFeather.java @@ -17,7 +17,7 @@ import mage.filter.predicate.mageobject.ColorPredicate; */ public final class AngelsFeather extends CardImpl { - private final static FilterSpell filter = new FilterSpell("a white spell"); + private static final FilterSpell filter = new FilterSpell("a white spell"); static { filter.add(new ColorPredicate(ObjectColor.WHITE)); diff --git a/Mage.Sets/src/mage/cards/a/AngrathsFury.java b/Mage.Sets/src/mage/cards/a/AngrathsFury.java index 40cfd164590..dcf0f829f46 100644 --- a/Mage.Sets/src/mage/cards/a/AngrathsFury.java +++ b/Mage.Sets/src/mage/cards/a/AngrathsFury.java @@ -20,7 +20,7 @@ import mage.target.targetpointer.SecondTargetPointer; */ public final class AngrathsFury extends CardImpl { - private final static FilterCard filter = new FilterCard("Angrath, Minotaur Pirate"); + private static final FilterCard filter = new FilterCard("Angrath, Minotaur Pirate"); static { filter.add(new NamePredicate(filter.getMessage())); diff --git a/Mage.Sets/src/mage/cards/a/AnimateDead.java b/Mage.Sets/src/mage/cards/a/AnimateDead.java index c74a187ef30..0f833cc16e8 100644 --- a/Mage.Sets/src/mage/cards/a/AnimateDead.java +++ b/Mage.Sets/src/mage/cards/a/AnimateDead.java @@ -189,7 +189,7 @@ class AnimateDeadAttachEffect extends OneShotEffect { class AnimateDeadChangeAbilityEffect extends ContinuousEffectImpl implements SourceEffect { - private final static Ability newAbility = new EnchantAbility("creature put onto the battlefield with Animate Dead"); + private static final Ability newAbility = new EnchantAbility("creature put onto the battlefield with Animate Dead"); static { newAbility.setRuleAtTheTop(true); diff --git a/Mage.Sets/src/mage/cards/a/AquitectsWill.java b/Mage.Sets/src/mage/cards/a/AquitectsWill.java index 29ee4554919..b9b1d00d7ff 100644 --- a/Mage.Sets/src/mage/cards/a/AquitectsWill.java +++ b/Mage.Sets/src/mage/cards/a/AquitectsWill.java @@ -25,7 +25,7 @@ import java.util.UUID; */ public final class AquitectsWill extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("Merfolk"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("Merfolk"); static { filter.add(new SubtypePredicate(SubType.MERFOLK)); diff --git a/Mage.Sets/src/mage/cards/a/ArenaOfTheAncients.java b/Mage.Sets/src/mage/cards/a/ArenaOfTheAncients.java index 466dcdc9e2c..60f5990d5a3 100644 --- a/Mage.Sets/src/mage/cards/a/ArenaOfTheAncients.java +++ b/Mage.Sets/src/mage/cards/a/ArenaOfTheAncients.java @@ -23,7 +23,7 @@ import mage.filter.predicate.mageobject.SupertypePredicate; */ public final class ArenaOfTheAncients extends CardImpl { - private final static FilterCreaturePermanent legendaryFilter = new FilterCreaturePermanent("legendary creatures"); + private static final FilterCreaturePermanent legendaryFilter = new FilterCreaturePermanent("legendary creatures"); static { legendaryFilter.add(new SupertypePredicate(SuperType.LEGENDARY)); } diff --git a/Mage.Sets/src/mage/cards/a/AvoidFate.java b/Mage.Sets/src/mage/cards/a/AvoidFate.java index c5d9a4834a1..2e8bd468318 100644 --- a/Mage.Sets/src/mage/cards/a/AvoidFate.java +++ b/Mage.Sets/src/mage/cards/a/AvoidFate.java @@ -22,7 +22,7 @@ import java.util.UUID; */ public final class AvoidFate extends CardImpl { - private final static FilterSpell filter = new FilterSpell("instant or Aura spell that targets a permanent you control"); + private static final FilterSpell filter = new FilterSpell("instant or Aura spell that targets a permanent you control"); static { filter.add(Predicates.or(new CardTypePredicate(CardType.INSTANT), new SubtypePredicate(SubType.AURA))); diff --git a/Mage.Sets/src/mage/cards/a/AyeshaTanaka.java b/Mage.Sets/src/mage/cards/a/AyeshaTanaka.java index cf8165cc371..a0aa2952108 100644 --- a/Mage.Sets/src/mage/cards/a/AyeshaTanaka.java +++ b/Mage.Sets/src/mage/cards/a/AyeshaTanaka.java @@ -26,7 +26,7 @@ import mage.target.common.TargetActivatedAbility; */ public final class AyeshaTanaka extends CardImpl { - private final static FilterStackObject filter = new FilterStackObject("activated ability from an artifact source"); + private static final FilterStackObject filter = new FilterStackObject("activated ability from an artifact source"); static { filter.add(new ArtifactSourcePredicate()); diff --git a/Mage.Sets/src/mage/cards/b/BanisherPriest.java b/Mage.Sets/src/mage/cards/b/BanisherPriest.java index 8767e9754db..83b8c0fa0f3 100644 --- a/Mage.Sets/src/mage/cards/b/BanisherPriest.java +++ b/Mage.Sets/src/mage/cards/b/BanisherPriest.java @@ -28,7 +28,7 @@ import mage.util.CardUtil; */ public final class BanisherPriest extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/b/BanishingLight.java b/Mage.Sets/src/mage/cards/b/BanishingLight.java index 56a3eed0ce7..5383a01ccc0 100644 --- a/Mage.Sets/src/mage/cards/b/BanishingLight.java +++ b/Mage.Sets/src/mage/cards/b/BanishingLight.java @@ -21,7 +21,7 @@ import mage.target.TargetPermanent; */ public final class BanishingLight extends CardImpl { - private final static FilterNonlandPermanent filter = new FilterNonlandPermanent(); + private static final FilterNonlandPermanent filter = new FilterNonlandPermanent(); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java b/Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java index 4ea8d134617..7cd9d78dcb6 100644 --- a/Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java +++ b/Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java @@ -70,7 +70,7 @@ public final class BaruFistOfKrosa extends CardImpl { class BaruFistOfKrosaEffect extends OneShotEffect { - final static FilterControlledPermanent filter = new FilterControlledLandPermanent("lands you control"); + static final FilterControlledPermanent filter = new FilterControlledLandPermanent("lands you control"); BaruFistOfKrosaEffect() { super(Outcome.PutCreatureInPlay); diff --git a/Mage.Sets/src/mage/cards/b/BastionProtector.java b/Mage.Sets/src/mage/cards/b/BastionProtector.java index ba1fdaac309..fa5054b1d93 100644 --- a/Mage.Sets/src/mage/cards/b/BastionProtector.java +++ b/Mage.Sets/src/mage/cards/b/BastionProtector.java @@ -24,7 +24,7 @@ import mage.filter.predicate.permanent.CommanderPredicate; */ public final class BastionProtector extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Commander creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Commander creatures"); static { filter.add(CommanderPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/b/BishopOfBinding.java b/Mage.Sets/src/mage/cards/b/BishopOfBinding.java index ac53b0111a0..9b1fccfe486 100644 --- a/Mage.Sets/src/mage/cards/b/BishopOfBinding.java +++ b/Mage.Sets/src/mage/cards/b/BishopOfBinding.java @@ -35,7 +35,7 @@ import mage.util.CardUtil; */ public final class BishopOfBinding extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/b/BladewingsThrall.java b/Mage.Sets/src/mage/cards/b/BladewingsThrall.java index f9de91df98b..bac7f52f713 100644 --- a/Mage.Sets/src/mage/cards/b/BladewingsThrall.java +++ b/Mage.Sets/src/mage/cards/b/BladewingsThrall.java @@ -25,7 +25,7 @@ import mage.filter.common.FilterCreaturePermanent; */ public final class BladewingsThrall extends CardImpl { - final static private String RULE = "{this} has flying as long as you control a Dragon"; + static final private String RULE = "{this} has flying as long as you control a Dragon"; public BladewingsThrall(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}"); diff --git a/Mage.Sets/src/mage/cards/b/BlightHerder.java b/Mage.Sets/src/mage/cards/b/BlightHerder.java index 12c4977360d..598dc52a20e 100644 --- a/Mage.Sets/src/mage/cards/b/BlightHerder.java +++ b/Mage.Sets/src/mage/cards/b/BlightHerder.java @@ -48,7 +48,7 @@ public final class BlightHerder extends CardImpl { class BlightHerderEffect extends OneShotEffect { - private final static FilterCard filter = new FilterCard("cards your opponents own from exile"); + private static final FilterCard filter = new FilterCard("cards your opponents own from exile"); static { filter.add(new OwnerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/b/BloodCursedKnight.java b/Mage.Sets/src/mage/cards/b/BloodCursedKnight.java index b80b2c8cd78..71adc8a30aa 100644 --- a/Mage.Sets/src/mage/cards/b/BloodCursedKnight.java +++ b/Mage.Sets/src/mage/cards/b/BloodCursedKnight.java @@ -24,8 +24,8 @@ import mage.filter.common.FilterControlledEnchantmentPermanent; */ public final class BloodCursedKnight extends CardImpl { - final static private String rule1 = "As long as you control an enchantment, {this} gets +1/+1"; - final static private String rule2 = "and has lifelink"; + static final private String rule1 = "As long as you control an enchantment, {this} gets +1/+1"; + static final private String rule2 = "and has lifelink"; public BloodCursedKnight(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{B}"); diff --git a/Mage.Sets/src/mage/cards/b/Bloodbriar.java b/Mage.Sets/src/mage/cards/b/Bloodbriar.java index 644927bfcbf..6db0ffa8988 100644 --- a/Mage.Sets/src/mage/cards/b/Bloodbriar.java +++ b/Mage.Sets/src/mage/cards/b/Bloodbriar.java @@ -21,7 +21,7 @@ import mage.filter.predicate.permanent.ControllerPredicate; */ public final class Bloodbriar extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("another permanent"); + private static final FilterPermanent filter = new FilterPermanent("another permanent"); static { filter.add(new ControllerPredicate(TargetController.YOU)); diff --git a/Mage.Sets/src/mage/cards/b/BloodswornSteward.java b/Mage.Sets/src/mage/cards/b/BloodswornSteward.java index 21ed7ccdc95..10dcbe7f9fc 100644 --- a/Mage.Sets/src/mage/cards/b/BloodswornSteward.java +++ b/Mage.Sets/src/mage/cards/b/BloodswornSteward.java @@ -25,7 +25,7 @@ import mage.filter.predicate.permanent.CommanderPredicate; */ public final class BloodswornSteward extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Commander creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Commander creatures"); static { filter.add(CommanderPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/b/BogGlider.java b/Mage.Sets/src/mage/cards/b/BogGlider.java index ed773d4f405..d00ee5c13b1 100644 --- a/Mage.Sets/src/mage/cards/b/BogGlider.java +++ b/Mage.Sets/src/mage/cards/b/BogGlider.java @@ -29,7 +29,7 @@ import mage.target.common.TargetControlledPermanent; */ public final class BogGlider extends CardImpl { - final static FilterControlledPermanent landFilter = new FilterControlledLandPermanent("a land"); + static final FilterControlledPermanent landFilter = new FilterControlledLandPermanent("a land"); private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with converted mana cost 2 or less"); static { diff --git a/Mage.Sets/src/mage/cards/b/BoilingEarth.java b/Mage.Sets/src/mage/cards/b/BoilingEarth.java index a6d410a08f7..bb72e70568b 100644 --- a/Mage.Sets/src/mage/cards/b/BoilingEarth.java +++ b/Mage.Sets/src/mage/cards/b/BoilingEarth.java @@ -17,7 +17,7 @@ import mage.filter.predicate.permanent.ControllerPredicate; */ public final class BoilingEarth extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature your opponents control"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature your opponents control"); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/b/BoundByMoonsilver.java b/Mage.Sets/src/mage/cards/b/BoundByMoonsilver.java index e3350aa8774..6edd91e6fe0 100644 --- a/Mage.Sets/src/mage/cards/b/BoundByMoonsilver.java +++ b/Mage.Sets/src/mage/cards/b/BoundByMoonsilver.java @@ -26,7 +26,7 @@ import java.util.UUID; */ public final class BoundByMoonsilver extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("another permanent"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("another permanent"); static { filter.add(AnotherPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/b/BrandedBrawlers.java b/Mage.Sets/src/mage/cards/b/BrandedBrawlers.java index 469bfcc8850..af4918a29d5 100644 --- a/Mage.Sets/src/mage/cards/b/BrandedBrawlers.java +++ b/Mage.Sets/src/mage/cards/b/BrandedBrawlers.java @@ -31,7 +31,7 @@ public final class BrandedBrawlers extends CardImpl { filter.add(Predicates.not(TappedPredicate.instance)); } - final static private String rule = "{this} can't block if you control an untapped land"; + static final private String rule = "{this} can't block if you control an untapped land"; public BrandedBrawlers(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{R}"); diff --git a/Mage.Sets/src/mage/cards/b/BrownOuphe.java b/Mage.Sets/src/mage/cards/b/BrownOuphe.java index b7ba3b157a6..d41d846a2d9 100644 --- a/Mage.Sets/src/mage/cards/b/BrownOuphe.java +++ b/Mage.Sets/src/mage/cards/b/BrownOuphe.java @@ -24,7 +24,7 @@ import mage.target.common.TargetActivatedAbility; */ public final class BrownOuphe extends CardImpl { - private final static FilterStackObject filter = new FilterStackObject("activated ability from an artifact source"); + private static final FilterStackObject filter = new FilterStackObject("activated ability from an artifact source"); static { filter.add(new ArtifactSourcePredicate()); diff --git a/Mage.Sets/src/mage/cards/b/BudokaGardener.java b/Mage.Sets/src/mage/cards/b/BudokaGardener.java index 6bf5ead6b27..309f3980462 100644 --- a/Mage.Sets/src/mage/cards/b/BudokaGardener.java +++ b/Mage.Sets/src/mage/cards/b/BudokaGardener.java @@ -56,7 +56,7 @@ public final class BudokaGardener extends CardImpl { class BudokaGardenerEffect extends OneShotEffect { - final static FilterControlledPermanent filterLands = new FilterControlledLandPermanent("lands you control"); + static final FilterControlledPermanent filterLands = new FilterControlledLandPermanent("lands you control"); BudokaGardenerEffect() { super(Outcome.PutLandInPlay); diff --git a/Mage.Sets/src/mage/cards/b/BurningEarth.java b/Mage.Sets/src/mage/cards/b/BurningEarth.java index 885b5517203..901829dc536 100644 --- a/Mage.Sets/src/mage/cards/b/BurningEarth.java +++ b/Mage.Sets/src/mage/cards/b/BurningEarth.java @@ -19,7 +19,7 @@ import mage.filter.predicate.mageobject.SupertypePredicate; */ public final class BurningEarth extends CardImpl { - private final static FilterLandPermanent filter = new FilterLandPermanent("a player taps a nonbasic land"); + private static final FilterLandPermanent filter = new FilterLandPermanent("a player taps a nonbasic land"); static { filter.add(Predicates.not(new SupertypePredicate(SuperType.BASIC))); diff --git a/Mage.Sets/src/mage/cards/c/CapturedByTheConsulate.java b/Mage.Sets/src/mage/cards/c/CapturedByTheConsulate.java index ea9e9137709..66dedbd9d56 100644 --- a/Mage.Sets/src/mage/cards/c/CapturedByTheConsulate.java +++ b/Mage.Sets/src/mage/cards/c/CapturedByTheConsulate.java @@ -33,7 +33,7 @@ import mage.target.targetpointer.FixedTarget; */ public final class CapturedByTheConsulate extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent(); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { filter.add(new ControllerPredicate(TargetController.NOT_YOU)); diff --git a/Mage.Sets/src/mage/cards/c/CastOut.java b/Mage.Sets/src/mage/cards/c/CastOut.java index ea4dd6d9530..80465f8c2b4 100644 --- a/Mage.Sets/src/mage/cards/c/CastOut.java +++ b/Mage.Sets/src/mage/cards/c/CastOut.java @@ -24,7 +24,7 @@ import mage.target.TargetPermanent; */ public final class CastOut extends CardImpl { - private final static FilterNonlandPermanent filter = new FilterNonlandPermanent(); + private static final FilterNonlandPermanent filter = new FilterNonlandPermanent(); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/c/CatacombSifter.java b/Mage.Sets/src/mage/cards/c/CatacombSifter.java index 39d60404112..1ea063803cf 100644 --- a/Mage.Sets/src/mage/cards/c/CatacombSifter.java +++ b/Mage.Sets/src/mage/cards/c/CatacombSifter.java @@ -24,7 +24,7 @@ import mage.game.permanent.token.EldraziScionToken; */ public final class CatacombSifter extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature you control"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature you control"); static { filter.add(AnotherPredicate.instance); filter.add(new ControllerPredicate(TargetController.YOU)); diff --git a/Mage.Sets/src/mage/cards/c/ChampionOfDusk.java b/Mage.Sets/src/mage/cards/c/ChampionOfDusk.java index e5c218c007d..dedfdaa9def 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionOfDusk.java +++ b/Mage.Sets/src/mage/cards/c/ChampionOfDusk.java @@ -23,7 +23,7 @@ import java.util.UUID; */ public final class ChampionOfDusk extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("Vampires you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("Vampires you control"); static { filter.add(new SubtypePredicate(SubType.VAMPIRE)); diff --git a/Mage.Sets/src/mage/cards/c/ChampionOfLambholt.java b/Mage.Sets/src/mage/cards/c/ChampionOfLambholt.java index 00e0561590b..c7c320feedf 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionOfLambholt.java +++ b/Mage.Sets/src/mage/cards/c/ChampionOfLambholt.java @@ -23,7 +23,7 @@ import java.util.UUID; */ public final class ChampionOfLambholt extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); static { filter.add(AnotherPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/c/ChandrasDefeat.java b/Mage.Sets/src/mage/cards/c/ChandrasDefeat.java index 23f2a0ca920..0da144b19c7 100644 --- a/Mage.Sets/src/mage/cards/c/ChandrasDefeat.java +++ b/Mage.Sets/src/mage/cards/c/ChandrasDefeat.java @@ -26,7 +26,7 @@ import mage.target.TargetPermanent; */ public final class ChandrasDefeat extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("creature or planeswalker"); + private static final FilterPermanent filter = new FilterPermanent("creature or planeswalker"); static { filter.add(new ColorPredicate(ObjectColor.RED)); diff --git a/Mage.Sets/src/mage/cards/c/ChandrasOutburst.java b/Mage.Sets/src/mage/cards/c/ChandrasOutburst.java index 6d682588f90..5d70eb1fb42 100644 --- a/Mage.Sets/src/mage/cards/c/ChandrasOutburst.java +++ b/Mage.Sets/src/mage/cards/c/ChandrasOutburst.java @@ -17,7 +17,7 @@ import mage.target.common.TargetPlayerOrPlaneswalker; */ public final class ChandrasOutburst extends CardImpl { - private final static FilterCard filter = new FilterCard("Chandra, Bold Pyromancer"); + private static final FilterCard filter = new FilterCard("Chandra, Bold Pyromancer"); static { filter.add(new NamePredicate("Chandra, Bold Pyromancer")); diff --git a/Mage.Sets/src/mage/cards/c/ChimericEgg.java b/Mage.Sets/src/mage/cards/c/ChimericEgg.java index 88816bba41f..55087136387 100644 --- a/Mage.Sets/src/mage/cards/c/ChimericEgg.java +++ b/Mage.Sets/src/mage/cards/c/ChimericEgg.java @@ -31,7 +31,7 @@ import mage.game.permanent.token.custom.CreatureToken; */ public final class ChimericEgg extends CardImpl { - private final static FilterSpell nonArtifactFilter = new FilterSpell("a nonartifact spell"); + private static final FilterSpell nonArtifactFilter = new FilterSpell("a nonartifact spell"); static { nonArtifactFilter.add(Predicates.not(new CardTypePredicate(CardType.ARTIFACT))); diff --git a/Mage.Sets/src/mage/cards/c/CitadelSiege.java b/Mage.Sets/src/mage/cards/c/CitadelSiege.java index 99948a47061..84764fb93db 100644 --- a/Mage.Sets/src/mage/cards/c/CitadelSiege.java +++ b/Mage.Sets/src/mage/cards/c/CitadelSiege.java @@ -28,9 +28,9 @@ import java.util.UUID; */ public final class CitadelSiege extends CardImpl { - private final static String ruleTrigger1 = "&bull Khans — At the beginning of combat on your turn, put two +1/+1 counters on target creature you control."; - private final static String ruleTrigger2 = "&bull Dragons — At the beginning of combat on each opponent's turn, tap target creature that player controls."; - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature controlled by the active player"); + private static final String ruleTrigger1 = "&bull Khans — At the beginning of combat on your turn, put two +1/+1 counters on target creature you control."; + private static final String ruleTrigger2 = "&bull Dragons — At the beginning of combat on each opponent's turn, tap target creature that player controls."; + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature controlled by the active player"); static { filter.add(CitadelSiegePredicate.instance); diff --git a/Mage.Sets/src/mage/cards/c/CloseQuarters.java b/Mage.Sets/src/mage/cards/c/CloseQuarters.java index 17cbd66ffd1..1d0fa5519cc 100644 --- a/Mage.Sets/src/mage/cards/c/CloseQuarters.java +++ b/Mage.Sets/src/mage/cards/c/CloseQuarters.java @@ -19,7 +19,7 @@ import mage.target.common.TargetAnyTarget; */ public final class CloseQuarters extends CardImpl { - final static private FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature you control"); + static final private FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature you control"); static { filter.add(new ControllerPredicate(TargetController.YOU)); diff --git a/Mage.Sets/src/mage/cards/c/ConclaveTribunal.java b/Mage.Sets/src/mage/cards/c/ConclaveTribunal.java index d06e3d72f86..ca5fec47016 100644 --- a/Mage.Sets/src/mage/cards/c/ConclaveTribunal.java +++ b/Mage.Sets/src/mage/cards/c/ConclaveTribunal.java @@ -21,7 +21,7 @@ import mage.target.TargetPermanent; */ public final class ConclaveTribunal extends CardImpl { - private final static FilterNonlandPermanent filter = new FilterNonlandPermanent(); + private static final FilterNonlandPermanent filter = new FilterNonlandPermanent(); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/c/ConfiscationCoup.java b/Mage.Sets/src/mage/cards/c/ConfiscationCoup.java index ff2bc46367d..7d3d9591253 100644 --- a/Mage.Sets/src/mage/cards/c/ConfiscationCoup.java +++ b/Mage.Sets/src/mage/cards/c/ConfiscationCoup.java @@ -29,7 +29,7 @@ import mage.target.targetpointer.FixedTarget; */ public final class ConfiscationCoup extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("creature or artifact"); + private static final FilterPermanent filter = new FilterPermanent("creature or artifact"); static { filter.add(Predicates.or(new CardTypePredicate(CardType.CREATURE), new CardTypePredicate(CardType.ARTIFACT))); diff --git a/Mage.Sets/src/mage/cards/c/Confound.java b/Mage.Sets/src/mage/cards/c/Confound.java index 6a04ca4571b..1a46edb59c5 100644 --- a/Mage.Sets/src/mage/cards/c/Confound.java +++ b/Mage.Sets/src/mage/cards/c/Confound.java @@ -18,7 +18,7 @@ import mage.target.TargetSpell; */ public final class Confound extends CardImpl { - private final static FilterSpell filter = new FilterSpell("spell that targets a creature"); + private static final FilterSpell filter = new FilterSpell("spell that targets a creature"); static { filter.add(new TargetsPermanentPredicate(new FilterCreaturePermanent())); diff --git a/Mage.Sets/src/mage/cards/c/ConsulsShieldguard.java b/Mage.Sets/src/mage/cards/c/ConsulsShieldguard.java index 16798cb14c1..29fe70cdc5d 100644 --- a/Mage.Sets/src/mage/cards/c/ConsulsShieldguard.java +++ b/Mage.Sets/src/mage/cards/c/ConsulsShieldguard.java @@ -26,7 +26,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class ConsulsShieldguard extends CardImpl { - private final static FilterAttackingCreature filter = new FilterAttackingCreature(); + private static final FilterAttackingCreature filter = new FilterAttackingCreature(); static { filter.add(AnotherPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/c/CrimsonHonorGuard.java b/Mage.Sets/src/mage/cards/c/CrimsonHonorGuard.java index 147aeb97ba3..4d8f96c8abd 100644 --- a/Mage.Sets/src/mage/cards/c/CrimsonHonorGuard.java +++ b/Mage.Sets/src/mage/cards/c/CrimsonHonorGuard.java @@ -53,7 +53,7 @@ public final class CrimsonHonorGuard extends CardImpl { class CrimsonHonorGuardEffect extends OneShotEffect { - private final static FilterPermanent filter = new FilterPermanent("Commander"); + private static final FilterPermanent filter = new FilterPermanent("Commander"); static { filter.add(CommanderPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/c/CrossroadsConsecrator.java b/Mage.Sets/src/mage/cards/c/CrossroadsConsecrator.java index 0cfc1cde782..91088cacf8d 100644 --- a/Mage.Sets/src/mage/cards/c/CrossroadsConsecrator.java +++ b/Mage.Sets/src/mage/cards/c/CrossroadsConsecrator.java @@ -24,7 +24,7 @@ import mage.target.common.TargetAttackingCreature; */ public final class CrossroadsConsecrator extends CardImpl { - private final static FilterAttackingCreature filter = new FilterAttackingCreature("attacking Human"); + private static final FilterAttackingCreature filter = new FilterAttackingCreature("attacking Human"); static { filter.add(new SubtypePredicate(SubType.HUMAN)); diff --git a/Mage.Sets/src/mage/cards/c/CruelRevival.java b/Mage.Sets/src/mage/cards/c/CruelRevival.java index 8b06c4f8365..47a862248d2 100644 --- a/Mage.Sets/src/mage/cards/c/CruelRevival.java +++ b/Mage.Sets/src/mage/cards/c/CruelRevival.java @@ -26,8 +26,8 @@ import java.util.UUID; */ public final class CruelRevival extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Zombie creature"); - private final static FilterCard filter2 = new FilterCard("Zombie card from your graveyard"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Zombie creature"); + private static final FilterCard filter2 = new FilterCard("Zombie card from your graveyard"); static { filter.add(new CardTypePredicate(CardType.CREATURE)); diff --git a/Mage.Sets/src/mage/cards/c/Cryptoplasm.java b/Mage.Sets/src/mage/cards/c/Cryptoplasm.java index 2fcf2c30d97..3b159867ea0 100644 --- a/Mage.Sets/src/mage/cards/c/Cryptoplasm.java +++ b/Mage.Sets/src/mage/cards/c/Cryptoplasm.java @@ -25,7 +25,7 @@ import mage.util.functions.ApplyToPermanent; */ public final class Cryptoplasm extends CardImpl { - final static FilterCreaturePermanent filter = new FilterCreaturePermanent(); + static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { filter.add(AnotherPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/c/CultOfTheWaxingMoon.java b/Mage.Sets/src/mage/cards/c/CultOfTheWaxingMoon.java index eb94342220b..da9dab039af 100644 --- a/Mage.Sets/src/mage/cards/c/CultOfTheWaxingMoon.java +++ b/Mage.Sets/src/mage/cards/c/CultOfTheWaxingMoon.java @@ -47,7 +47,7 @@ public final class CultOfTheWaxingMoon extends CardImpl { class CultOfTheWaxingMoonAbility extends TriggeredAbilityImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); static { filter.add(Predicates.not(new SubtypePredicate(SubType.HUMAN))); diff --git a/Mage.Sets/src/mage/cards/d/DampeningPulse.java b/Mage.Sets/src/mage/cards/d/DampeningPulse.java index 48d1ab9fa39..54998b8e2ce 100644 --- a/Mage.Sets/src/mage/cards/d/DampeningPulse.java +++ b/Mage.Sets/src/mage/cards/d/DampeningPulse.java @@ -19,7 +19,7 @@ import mage.filter.predicate.permanent.ControllerPredicate; */ public final class DampeningPulse extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control"); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/d/DanceOfTheDead.java b/Mage.Sets/src/mage/cards/d/DanceOfTheDead.java index 40b8b5a6f38..01eccf78337 100644 --- a/Mage.Sets/src/mage/cards/d/DanceOfTheDead.java +++ b/Mage.Sets/src/mage/cards/d/DanceOfTheDead.java @@ -204,7 +204,7 @@ class DanceOfTheDeadAttachEffect extends OneShotEffect { class DanceOfTheDeadChangeAbilityEffect extends ContinuousEffectImpl implements SourceEffect { - private final static Ability newAbility = new EnchantAbility("creature put onto the battlefield with Dance of the Dead"); + private static final Ability newAbility = new EnchantAbility("creature put onto the battlefield with Dance of the Dead"); static { newAbility.setRuleAtTheTop(true); diff --git a/Mage.Sets/src/mage/cards/d/DaringDemolition.java b/Mage.Sets/src/mage/cards/d/DaringDemolition.java index 176dedf496c..3bc03353c94 100644 --- a/Mage.Sets/src/mage/cards/d/DaringDemolition.java +++ b/Mage.Sets/src/mage/cards/d/DaringDemolition.java @@ -19,7 +19,7 @@ import mage.target.TargetPermanent; */ public final class DaringDemolition extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("creature or Vehicle"); + private static final FilterPermanent filter = new FilterPermanent("creature or Vehicle"); static { filter.add(Predicates.or(new CardTypePredicate(CardType.CREATURE), new SubtypePredicate(SubType.VEHICLE))); diff --git a/Mage.Sets/src/mage/cards/d/DarkSalvation.java b/Mage.Sets/src/mage/cards/d/DarkSalvation.java index 9c0b24555c4..ca82c4e59ef 100644 --- a/Mage.Sets/src/mage/cards/d/DarkSalvation.java +++ b/Mage.Sets/src/mage/cards/d/DarkSalvation.java @@ -58,7 +58,7 @@ public final class DarkSalvation extends CardImpl { class ZombiesControlledByTargetPlayerCount implements DynamicValue { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Zombies"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Zombies"); static { filter.add(new SubtypePredicate(SubType.ZOMBIE)); diff --git a/Mage.Sets/src/mage/cards/d/DarkslickShores.java b/Mage.Sets/src/mage/cards/d/DarkslickShores.java index 0dffdd6e4b2..82b941846af 100644 --- a/Mage.Sets/src/mage/cards/d/DarkslickShores.java +++ b/Mage.Sets/src/mage/cards/d/DarkslickShores.java @@ -23,7 +23,7 @@ import mage.filter.predicate.permanent.AnotherPredicate; */ public final class DarkslickShores extends CardImpl { - private final static FilterLandPermanent filter = new FilterLandPermanent(); + private static final FilterLandPermanent filter = new FilterLandPermanent(); static { filter.add(AnotherPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java b/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java index be7b60f0b46..2f82085d8cd 100644 --- a/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java +++ b/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java @@ -29,8 +29,8 @@ import mage.filter.predicate.permanent.AnotherPredicate; */ public final class DauntlessDourbark extends CardImpl { - final static private FilterControlledPermanent filter = new FilterControlledPermanent("Forests you control plus the number of Treefolk you control"); - final static private FilterControlledPermanent filter2 = new FilterControlledPermanent(); + static final private FilterControlledPermanent filter = new FilterControlledPermanent("Forests you control plus the number of Treefolk you control"); + static final private FilterControlledPermanent filter2 = new FilterControlledPermanent(); static { filter.add(Predicates.or(new SubtypePredicate(SubType.FOREST), @@ -39,7 +39,7 @@ public final class DauntlessDourbark extends CardImpl { filter2.add(AnotherPredicate.instance); } - final static private String rule = "{this} has trample as long as you control another Treefolk"; + static final private String rule = "{this} has trample as long as you control another Treefolk"; public DauntlessDourbark(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}"); diff --git a/Mage.Sets/src/mage/cards/d/DeadeyeHarpooner.java b/Mage.Sets/src/mage/cards/d/DeadeyeHarpooner.java index a8c31839c7a..f6ef1914b3d 100644 --- a/Mage.Sets/src/mage/cards/d/DeadeyeHarpooner.java +++ b/Mage.Sets/src/mage/cards/d/DeadeyeHarpooner.java @@ -24,7 +24,7 @@ import mage.watchers.common.RevoltWatcher; */ public final class DeadeyeHarpooner extends CardImpl { - private final static FilterOpponentsCreaturePermanent filter = new FilterOpponentsCreaturePermanent("tapped creature an opponent controls"); + private static final FilterOpponentsCreaturePermanent filter = new FilterOpponentsCreaturePermanent("tapped creature an opponent controls"); static { filter.add(TappedPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/d/DeathlessBehemoth.java b/Mage.Sets/src/mage/cards/d/DeathlessBehemoth.java index 393d20d1e6c..0cce899f7e8 100644 --- a/Mage.Sets/src/mage/cards/d/DeathlessBehemoth.java +++ b/Mage.Sets/src/mage/cards/d/DeathlessBehemoth.java @@ -23,7 +23,7 @@ import mage.target.common.TargetControlledPermanent; */ public final class DeathlessBehemoth extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("two Eldrazi Scions"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("two Eldrazi Scions"); static { filter.add(Predicates.and( diff --git a/Mage.Sets/src/mage/cards/d/DefiantSalvager.java b/Mage.Sets/src/mage/cards/d/DefiantSalvager.java index 8a6a3fc5924..7abc7ce3347 100644 --- a/Mage.Sets/src/mage/cards/d/DefiantSalvager.java +++ b/Mage.Sets/src/mage/cards/d/DefiantSalvager.java @@ -24,7 +24,7 @@ import mage.target.common.TargetControlledPermanent; */ public final class DefiantSalvager extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("an artifact or creature"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("an artifact or creature"); static { filter.add(Predicates.or(new CardTypePredicate(CardType.ARTIFACT), new CardTypePredicate(CardType.CREATURE))); diff --git a/Mage.Sets/src/mage/cards/d/DemonsHorn.java b/Mage.Sets/src/mage/cards/d/DemonsHorn.java index bc8400022df..71e71e2d01b 100644 --- a/Mage.Sets/src/mage/cards/d/DemonsHorn.java +++ b/Mage.Sets/src/mage/cards/d/DemonsHorn.java @@ -19,7 +19,7 @@ import mage.filter.predicate.mageobject.ColorPredicate; */ public final class DemonsHorn extends CardImpl { - private final static FilterSpell filter = new FilterSpell("a black spell"); + private static final FilterSpell filter = new FilterSpell("a black spell"); static { filter.add(new ColorPredicate(ObjectColor.BLACK)); diff --git a/Mage.Sets/src/mage/cards/d/DespoticScepter.java b/Mage.Sets/src/mage/cards/d/DespoticScepter.java index b08f92a42a2..d4757705ebc 100644 --- a/Mage.Sets/src/mage/cards/d/DespoticScepter.java +++ b/Mage.Sets/src/mage/cards/d/DespoticScepter.java @@ -21,7 +21,7 @@ import mage.target.TargetPermanent; */ public final class DespoticScepter extends CardImpl { - private final static FilterPermanent FILTER = new FilterPermanent("permanent you own"); + private static final FilterPermanent FILTER = new FilterPermanent("permanent you own"); static { FILTER.add(new OwnerPredicate(TargetController.YOU)); diff --git a/Mage.Sets/src/mage/cards/d/DinOfTheFireherd.java b/Mage.Sets/src/mage/cards/d/DinOfTheFireherd.java index f4d6055b6ad..a8bc994b4f6 100644 --- a/Mage.Sets/src/mage/cards/d/DinOfTheFireherd.java +++ b/Mage.Sets/src/mage/cards/d/DinOfTheFireherd.java @@ -48,8 +48,8 @@ public final class DinOfTheFireherd extends CardImpl { class DinOfTheFireherdEffect extends OneShotEffect { - private final static FilterControlledCreaturePermanent blackCreatureFilter = new FilterControlledCreaturePermanent("black creatures you control"); - private final static FilterControlledCreaturePermanent redCreatureFilter = new FilterControlledCreaturePermanent("red creatures you control"); + private static final FilterControlledCreaturePermanent blackCreatureFilter = new FilterControlledCreaturePermanent("black creatures you control"); + private static final FilterControlledCreaturePermanent redCreatureFilter = new FilterControlledCreaturePermanent("red creatures you control"); static { blackCreatureFilter.add(new ColorPredicate(ObjectColor.BLACK)); diff --git a/Mage.Sets/src/mage/cards/d/DiplomaticEscort.java b/Mage.Sets/src/mage/cards/d/DiplomaticEscort.java index 6e5555fdf8f..4132ba251b7 100644 --- a/Mage.Sets/src/mage/cards/d/DiplomaticEscort.java +++ b/Mage.Sets/src/mage/cards/d/DiplomaticEscort.java @@ -25,7 +25,7 @@ import mage.target.TargetStackObject; */ public final class DiplomaticEscort extends CardImpl { - private final static FilterStackObject filter = new FilterStackObject("spell or ability that targets a creature"); + private static final FilterStackObject filter = new FilterStackObject("spell or ability that targets a creature"); static { filter.add(new TargetsPermanentPredicate(new FilterCreaturePermanent())); diff --git a/Mage.Sets/src/mage/cards/d/DireUndercurrents.java b/Mage.Sets/src/mage/cards/d/DireUndercurrents.java index 9c104360e81..ce28bb0433c 100644 --- a/Mage.Sets/src/mage/cards/d/DireUndercurrents.java +++ b/Mage.Sets/src/mage/cards/d/DireUndercurrents.java @@ -22,11 +22,11 @@ import mage.target.TargetPlayer; */ public final class DireUndercurrents extends CardImpl { - private final static String rule1 = "Whenever a blue creature enters the battlefield under your control, you may have target player draw a card."; - private final static String rule2 = "Whenever a black creature enters the battlefield under your control, you may have target player discard a card."; + private static final String rule1 = "Whenever a blue creature enters the battlefield under your control, you may have target player draw a card."; + private static final String rule2 = "Whenever a black creature enters the battlefield under your control, you may have target player discard a card."; - private final static FilterControlledPermanent filterBlue = new FilterControlledCreaturePermanent(); - private final static FilterControlledPermanent filterBlack = new FilterControlledCreaturePermanent(); + private static final FilterControlledPermanent filterBlue = new FilterControlledCreaturePermanent(); + private static final FilterControlledPermanent filterBlack = new FilterControlledCreaturePermanent(); static { filterBlue.add(new ColorPredicate(ObjectColor.BLUE)); diff --git a/Mage.Sets/src/mage/cards/d/DissensionInTheRanks.java b/Mage.Sets/src/mage/cards/d/DissensionInTheRanks.java index 13d14c9460d..5719cf8b5b3 100644 --- a/Mage.Sets/src/mage/cards/d/DissensionInTheRanks.java +++ b/Mage.Sets/src/mage/cards/d/DissensionInTheRanks.java @@ -17,7 +17,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class DissensionInTheRanks extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("blocking creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("blocking creature"); static { filter.add(BlockingPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/d/DjinnIlluminatus.java b/Mage.Sets/src/mage/cards/d/DjinnIlluminatus.java index bba34f74968..c613b4238da 100644 --- a/Mage.Sets/src/mage/cards/d/DjinnIlluminatus.java +++ b/Mage.Sets/src/mage/cards/d/DjinnIlluminatus.java @@ -52,7 +52,7 @@ public final class DjinnIlluminatus extends CardImpl { class DjinnIlluminatusGainReplicateEffect extends ContinuousEffectImpl { - private final static FilterInstantOrSorcerySpell filter = new FilterInstantOrSorcerySpell(); + private static final FilterInstantOrSorcerySpell filter = new FilterInstantOrSorcerySpell(); private final Map replicateAbilities = new HashMap<>(); public DjinnIlluminatusGainReplicateEffect() { diff --git a/Mage.Sets/src/mage/cards/d/Domineer.java b/Mage.Sets/src/mage/cards/d/Domineer.java index f24c075f693..95afadeb8df 100644 --- a/Mage.Sets/src/mage/cards/d/Domineer.java +++ b/Mage.Sets/src/mage/cards/d/Domineer.java @@ -24,7 +24,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class Domineer extends CardImpl { - final static FilterCreaturePermanent filter = new FilterCreaturePermanent("artifact creature"); + static final FilterCreaturePermanent filter = new FilterCreaturePermanent("artifact creature"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/cards/d/DoubtlessOne.java b/Mage.Sets/src/mage/cards/d/DoubtlessOne.java index 03a655b1481..b29eff1bd4d 100644 --- a/Mage.Sets/src/mage/cards/d/DoubtlessOne.java +++ b/Mage.Sets/src/mage/cards/d/DoubtlessOne.java @@ -22,7 +22,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public final class DoubtlessOne extends CardImpl { - final static FilterPermanent filter = new FilterPermanent("Clerics on the battlefield"); + static final FilterPermanent filter = new FilterPermanent("Clerics on the battlefield"); static { filter.add(new SubtypePredicate(SubType.CLERIC)); diff --git a/Mage.Sets/src/mage/cards/d/DragonlordsPrerogative.java b/Mage.Sets/src/mage/cards/d/DragonlordsPrerogative.java index f90f8c05ee4..68af370d1a5 100644 --- a/Mage.Sets/src/mage/cards/d/DragonlordsPrerogative.java +++ b/Mage.Sets/src/mage/cards/d/DragonlordsPrerogative.java @@ -83,7 +83,7 @@ enum DragonlordsPrerogativeAdjuster implements CostAdjuster { class DragonlordsPrerogativeCondition implements Condition { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("Dragon"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("Dragon"); static { filter.add(new SubtypePredicate(SubType.DRAGON)); diff --git a/Mage.Sets/src/mage/cards/d/DragonsClaw.java b/Mage.Sets/src/mage/cards/d/DragonsClaw.java index eafaca5ef5e..647d66407c6 100644 --- a/Mage.Sets/src/mage/cards/d/DragonsClaw.java +++ b/Mage.Sets/src/mage/cards/d/DragonsClaw.java @@ -17,7 +17,7 @@ import mage.filter.predicate.mageobject.ColorPredicate; */ public final class DragonsClaw extends CardImpl { - private final static FilterSpell filter = new FilterSpell("a red spell"); + private static final FilterSpell filter = new FilterSpell("a red spell"); static { filter.add(new ColorPredicate(ObjectColor.RED)); diff --git a/Mage.Sets/src/mage/cards/d/DragonsEyeSavants.java b/Mage.Sets/src/mage/cards/d/DragonsEyeSavants.java index 528687ae190..a4fd2922cc7 100644 --- a/Mage.Sets/src/mage/cards/d/DragonsEyeSavants.java +++ b/Mage.Sets/src/mage/cards/d/DragonsEyeSavants.java @@ -25,7 +25,7 @@ import mage.target.common.TargetOpponent; */ public final class DragonsEyeSavants extends CardImpl { - private final static FilterCard filter = new FilterCard("a blue card in your hand"); + private static final FilterCard filter = new FilterCard("a blue card in your hand"); static { filter.add(new ColorPredicate(ObjectColor.BLUE)); } diff --git a/Mage.Sets/src/mage/cards/d/DramaticReversal.java b/Mage.Sets/src/mage/cards/d/DramaticReversal.java index 4d705f42b7f..a8d990a82da 100644 --- a/Mage.Sets/src/mage/cards/d/DramaticReversal.java +++ b/Mage.Sets/src/mage/cards/d/DramaticReversal.java @@ -16,7 +16,7 @@ import mage.filter.predicate.permanent.ControllerPredicate; */ public final class DramaticReversal extends CardImpl { - private final static FilterNonlandPermanent filter = new FilterNonlandPermanent("nonland permanents"); + private static final FilterNonlandPermanent filter = new FilterNonlandPermanent("nonland permanents"); static { filter.add(new ControllerPredicate(TargetController.YOU)); diff --git a/Mage.Sets/src/mage/cards/d/DuneBroodNephilim.java b/Mage.Sets/src/mage/cards/d/DuneBroodNephilim.java index b4f6e3f9cf1..2ea06d32390 100644 --- a/Mage.Sets/src/mage/cards/d/DuneBroodNephilim.java +++ b/Mage.Sets/src/mage/cards/d/DuneBroodNephilim.java @@ -19,7 +19,7 @@ import mage.game.permanent.token.DuneBroodNephilimToken; */ public final class DuneBroodNephilim extends CardImpl { - final static FilterControlledPermanent filterLands = new FilterControlledLandPermanent(); + static final FilterControlledPermanent filterLands = new FilterControlledLandPermanent(); public DuneBroodNephilim(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{B}{R}{G}{W}"); diff --git a/Mage.Sets/src/mage/cards/d/DungroveElder.java b/Mage.Sets/src/mage/cards/d/DungroveElder.java index f12ba5add7c..6a3d12ea275 100644 --- a/Mage.Sets/src/mage/cards/d/DungroveElder.java +++ b/Mage.Sets/src/mage/cards/d/DungroveElder.java @@ -23,7 +23,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public final class DungroveElder extends CardImpl { - final static FilterControlledPermanent filterLands = new FilterControlledPermanent("Forests you control"); + static final FilterControlledPermanent filterLands = new FilterControlledPermanent("Forests you control"); static { filterLands.add(new SubtypePredicate(SubType.FOREST)); diff --git a/Mage.Sets/src/mage/cards/d/DustStalker.java b/Mage.Sets/src/mage/cards/d/DustStalker.java index 4a156722407..8f2c44d4dd8 100644 --- a/Mage.Sets/src/mage/cards/d/DustStalker.java +++ b/Mage.Sets/src/mage/cards/d/DustStalker.java @@ -25,7 +25,7 @@ import mage.filter.predicate.permanent.AnotherPredicate; */ public final class DustStalker extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("if you control no other colorless creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("if you control no other colorless creatures"); static { filter.add(AnotherPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/e/EarlOfSquirrel.java b/Mage.Sets/src/mage/cards/e/EarlOfSquirrel.java index 37c2081f546..d213ba19deb 100644 --- a/Mage.Sets/src/mage/cards/e/EarlOfSquirrel.java +++ b/Mage.Sets/src/mage/cards/e/EarlOfSquirrel.java @@ -28,7 +28,7 @@ import mage.util.SubTypeList; */ public final class EarlOfSquirrel extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Creature tokens you control"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creature tokens you control"); private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("Other squirrels you control"); diff --git a/Mage.Sets/src/mage/cards/e/EddytrailHawk.java b/Mage.Sets/src/mage/cards/e/EddytrailHawk.java index e7bf591e8c8..6428e555f0f 100644 --- a/Mage.Sets/src/mage/cards/e/EddytrailHawk.java +++ b/Mage.Sets/src/mage/cards/e/EddytrailHawk.java @@ -26,7 +26,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class EddytrailHawk extends CardImpl { - private final static FilterAttackingCreature filter = new FilterAttackingCreature(); + private static final FilterAttackingCreature filter = new FilterAttackingCreature(); static { filter.add(AnotherPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/e/ElectrostaticBolt.java b/Mage.Sets/src/mage/cards/e/ElectrostaticBolt.java index af8469673f0..b0f405a1cd9 100644 --- a/Mage.Sets/src/mage/cards/e/ElectrostaticBolt.java +++ b/Mage.Sets/src/mage/cards/e/ElectrostaticBolt.java @@ -43,7 +43,7 @@ public final class ElectrostaticBolt extends CardImpl { class ElectrostaticBoltDamageValue implements DynamicValue { - final static FilterCreaturePermanent filter = new FilterCreaturePermanent(); + static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/cards/e/ElvishBranchbender.java b/Mage.Sets/src/mage/cards/e/ElvishBranchbender.java index 0dee090c343..117f6d63810 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishBranchbender.java +++ b/Mage.Sets/src/mage/cards/e/ElvishBranchbender.java @@ -58,7 +58,7 @@ public final class ElvishBranchbender extends CardImpl { class ElvishBranchbenderEffect extends OneShotEffect { - final static FilterControlledPermanent filter = new FilterControlledPermanent("Elves you control"); + static final FilterControlledPermanent filter = new FilterControlledPermanent("Elves you control"); static { filter.add(new SubtypePredicate(SubType.ELF)); } diff --git a/Mage.Sets/src/mage/cards/e/EnergyStorm.java b/Mage.Sets/src/mage/cards/e/EnergyStorm.java index e56b8fd6b0a..a3a8cc4593a 100644 --- a/Mage.Sets/src/mage/cards/e/EnergyStorm.java +++ b/Mage.Sets/src/mage/cards/e/EnergyStorm.java @@ -24,7 +24,7 @@ import mage.filter.predicate.mageobject.AbilityPredicate; */ public final class EnergyStorm extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures with flying"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures with flying"); static { filter.add(new AbilityPredicate(FlyingAbility.class)); diff --git a/Mage.Sets/src/mage/cards/e/ErebossTitan.java b/Mage.Sets/src/mage/cards/e/ErebossTitan.java index c155d1cf61e..d15a436bb83 100644 --- a/Mage.Sets/src/mage/cards/e/ErebossTitan.java +++ b/Mage.Sets/src/mage/cards/e/ErebossTitan.java @@ -34,7 +34,7 @@ import mage.players.Player; */ public final class ErebossTitan extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent(); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/e/EtaliPrimalStorm.java b/Mage.Sets/src/mage/cards/e/EtaliPrimalStorm.java index de1af82213d..5c5ff2373d8 100644 --- a/Mage.Sets/src/mage/cards/e/EtaliPrimalStorm.java +++ b/Mage.Sets/src/mage/cards/e/EtaliPrimalStorm.java @@ -58,7 +58,7 @@ public final class EtaliPrimalStorm extends CardImpl { class EtaliPrimalStormEffect extends OneShotEffect { - private final static FilterCard filter = new FilterCard("nonland cards"); + private static final FilterCard filter = new FilterCard("nonland cards"); static { filter.add(Predicates.not(new CardTypePredicate(CardType.LAND))); diff --git a/Mage.Sets/src/mage/cards/e/ExtractorDemon.java b/Mage.Sets/src/mage/cards/e/ExtractorDemon.java index 0576b6b22e5..5ae17fa5acc 100644 --- a/Mage.Sets/src/mage/cards/e/ExtractorDemon.java +++ b/Mage.Sets/src/mage/cards/e/ExtractorDemon.java @@ -24,7 +24,7 @@ import mage.target.TargetPlayer; */ public final class ExtractorDemon extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); static { filter.add(AnotherPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/e/EzurisBrigade.java b/Mage.Sets/src/mage/cards/e/EzurisBrigade.java index 1602de0fe62..28bd5cf3748 100644 --- a/Mage.Sets/src/mage/cards/e/EzurisBrigade.java +++ b/Mage.Sets/src/mage/cards/e/EzurisBrigade.java @@ -24,7 +24,7 @@ import mage.constants.Zone; * @author Loki */ public final class EzurisBrigade extends CardImpl { - private static final String text = "Metalcraft — As long as you control three or more artifacts, Ezuri's Brigade gets +4/+4 and has trample"; + private static final String rule = "Metalcraft — As long as you control three or more artifacts, Ezuri's Brigade gets +4/+4 and has trample"; public EzurisBrigade (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}"); @@ -34,7 +34,7 @@ public final class EzurisBrigade extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); ContinuousEffect boostSource = new BoostSourceEffect(4, 4, Duration.WhileOnBattlefield); - ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, MetalcraftCondition.instance, text); + ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, MetalcraftCondition.instance, rule); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield), MetalcraftCondition.instance, "")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FairgroundsWarden.java b/Mage.Sets/src/mage/cards/f/FairgroundsWarden.java index ad31ca0c71f..03ab1b1fd99 100644 --- a/Mage.Sets/src/mage/cards/f/FairgroundsWarden.java +++ b/Mage.Sets/src/mage/cards/f/FairgroundsWarden.java @@ -28,7 +28,7 @@ import mage.util.CardUtil; */ public final class FairgroundsWarden extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/f/ForerunnerOfSlaughter.java b/Mage.Sets/src/mage/cards/f/ForerunnerOfSlaughter.java index 75685ca33fc..558a0caccb8 100644 --- a/Mage.Sets/src/mage/cards/f/ForerunnerOfSlaughter.java +++ b/Mage.Sets/src/mage/cards/f/ForerunnerOfSlaughter.java @@ -25,7 +25,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class ForerunnerOfSlaughter extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("colorless creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("colorless creature"); static { filter.add(ColorlessPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/f/ForiysianTotem.java b/Mage.Sets/src/mage/cards/f/ForiysianTotem.java index ce7ea5dacc7..ee0c0033744 100644 --- a/Mage.Sets/src/mage/cards/f/ForiysianTotem.java +++ b/Mage.Sets/src/mage/cards/f/ForiysianTotem.java @@ -28,7 +28,7 @@ import mage.game.permanent.token.Token; */ public final class ForiysianTotem extends CardImpl { - private final static String ruleText = "As long as {this} is a creature, it can block an additional creature each combat."; + private static final String ruleText = "As long as {this} is a creature, it can block an additional creature each combat."; public ForiysianTotem(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); diff --git a/Mage.Sets/src/mage/cards/f/FoundryHornet.java b/Mage.Sets/src/mage/cards/f/FoundryHornet.java index dc9eb22f34f..86571157dc4 100644 --- a/Mage.Sets/src/mage/cards/f/FoundryHornet.java +++ b/Mage.Sets/src/mage/cards/f/FoundryHornet.java @@ -28,7 +28,7 @@ import mage.filter.predicate.permanent.CounterPredicate; public final class FoundryHornet extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a creature with a +1/+1 counter on it"); - private final static FilterCreaturePermanent filterOpponent = new FilterCreaturePermanent(); + private static final FilterCreaturePermanent filterOpponent = new FilterCreaturePermanent(); static { filter.add(new CounterPredicate(CounterType.P1P1)); diff --git a/Mage.Sets/src/mage/cards/f/FreyaliseSupplicant.java b/Mage.Sets/src/mage/cards/f/FreyaliseSupplicant.java index 92a0ce7e204..3a0d18ab5c2 100644 --- a/Mage.Sets/src/mage/cards/f/FreyaliseSupplicant.java +++ b/Mage.Sets/src/mage/cards/f/FreyaliseSupplicant.java @@ -27,7 +27,7 @@ import mage.target.common.TargetControlledCreaturePermanent; */ public final class FreyaliseSupplicant extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("red or white creature"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("red or white creature"); static { filter.add(Predicates.or(new ColorPredicate(ObjectColor.RED), diff --git a/Mage.Sets/src/mage/cards/f/FrontierSiege.java b/Mage.Sets/src/mage/cards/f/FrontierSiege.java index 6674c0568f0..00af641bf3b 100644 --- a/Mage.Sets/src/mage/cards/f/FrontierSiege.java +++ b/Mage.Sets/src/mage/cards/f/FrontierSiege.java @@ -39,8 +39,8 @@ public final class FrontierSiege extends CardImpl { filter.add(new AbilityPredicate(FlyingAbility.class)); filter2.add(new ControllerPredicate(TargetController.NOT_YOU)); } - private final static String ruleTrigger1 = "&bull Khans — At the beginning of each of your main phases, add {G}{G}."; - private final static String ruleTrigger2 = "&bull Dragons — Whenever a creature with flying enters the battlefield under your control, you may have it fight target creature you don't control."; + private static final String ruleTrigger1 = "&bull Khans — At the beginning of each of your main phases, add {G}{G}."; + private static final String ruleTrigger2 = "&bull Dragons — Whenever a creature with flying enters the battlefield under your control, you may have it fight target creature you don't control."; public FrontierSiege(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{G}"); diff --git a/Mage.Sets/src/mage/cards/g/GOTOJAIL.java b/Mage.Sets/src/mage/cards/g/GOTOJAIL.java index f7eea87ac1b..acfb52eb170 100644 --- a/Mage.Sets/src/mage/cards/g/GOTOJAIL.java +++ b/Mage.Sets/src/mage/cards/g/GOTOJAIL.java @@ -33,7 +33,7 @@ import mage.util.CardUtil; */ public final class GOTOJAIL extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/g/GaeasLiege.java b/Mage.Sets/src/mage/cards/g/GaeasLiege.java index 0b4a5d87def..99c8c30d33f 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasLiege.java +++ b/Mage.Sets/src/mage/cards/g/GaeasLiege.java @@ -34,7 +34,7 @@ import mage.target.common.TargetLandPermanent; */ public final class GaeasLiege extends CardImpl { - final static FilterControlledPermanent filterLands = new FilterControlledPermanent("Forests you control"); + static final FilterControlledPermanent filterLands = new FilterControlledPermanent("Forests you control"); static { filterLands.add(new SubtypePredicate(SubType.FOREST)); diff --git a/Mage.Sets/src/mage/cards/g/GangrenousZombies.java b/Mage.Sets/src/mage/cards/g/GangrenousZombies.java index 4fd7847eb5b..17fca38a81c 100644 --- a/Mage.Sets/src/mage/cards/g/GangrenousZombies.java +++ b/Mage.Sets/src/mage/cards/g/GangrenousZombies.java @@ -27,7 +27,7 @@ import java.util.UUID; */ public final class GangrenousZombies extends CardImpl { - private final static FilterLandPermanent filter = new FilterLandPermanent(); + private static final FilterLandPermanent filter = new FilterLandPermanent(); static { filter.add(new SupertypePredicate(SuperType.SNOW)); diff --git a/Mage.Sets/src/mage/cards/g/GeneralTazri.java b/Mage.Sets/src/mage/cards/g/GeneralTazri.java index c66d44f2502..013d1bd9199 100644 --- a/Mage.Sets/src/mage/cards/g/GeneralTazri.java +++ b/Mage.Sets/src/mage/cards/g/GeneralTazri.java @@ -68,7 +68,7 @@ public final class GeneralTazri extends CardImpl { class GeneralTazriColorCount implements DynamicValue { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent(); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { filter.add(new SubtypePredicate((SubType.ALLY))); diff --git a/Mage.Sets/src/mage/cards/g/GhalmasWarden.java b/Mage.Sets/src/mage/cards/g/GhalmasWarden.java index 22f8bb494b8..a371efbecb3 100644 --- a/Mage.Sets/src/mage/cards/g/GhalmasWarden.java +++ b/Mage.Sets/src/mage/cards/g/GhalmasWarden.java @@ -22,7 +22,7 @@ import mage.constants.Zone; */ public final class GhalmasWarden extends CardImpl { - private static final String text = "Metalcraft — Ghalma's Warden gets +2/+2 as long as you control three or more artifacts"; + private static final String rule = "Metalcraft — Ghalma's Warden gets +2/+2 as long as you control three or more artifacts"; public GhalmasWarden (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); @@ -32,7 +32,7 @@ public final class GhalmasWarden extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(4); ContinuousEffect boostSource = new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield); - ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, MetalcraftCondition.instance, text); + ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, MetalcraftCondition.instance, rule); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } diff --git a/Mage.Sets/src/mage/cards/g/GideonBattleForged.java b/Mage.Sets/src/mage/cards/g/GideonBattleForged.java index 79b48010596..f54e3445b75 100644 --- a/Mage.Sets/src/mage/cards/g/GideonBattleForged.java +++ b/Mage.Sets/src/mage/cards/g/GideonBattleForged.java @@ -35,7 +35,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class GideonBattleForged extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent(); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/g/GideonsResolve.java b/Mage.Sets/src/mage/cards/g/GideonsResolve.java index c5826bf3351..561bac51b20 100644 --- a/Mage.Sets/src/mage/cards/g/GideonsResolve.java +++ b/Mage.Sets/src/mage/cards/g/GideonsResolve.java @@ -20,7 +20,7 @@ import mage.filter.predicate.mageobject.NamePredicate; */ public final class GideonsResolve extends CardImpl { - private final static FilterCard filter = new FilterCard("Gideon, Martial Paragon"); + private static final FilterCard filter = new FilterCard("Gideon, Martial Paragon"); static { filter.add(new NamePredicate("Gideon, Martial Paragon")); diff --git a/Mage.Sets/src/mage/cards/g/GiltLeafWinnower.java b/Mage.Sets/src/mage/cards/g/GiltLeafWinnower.java index 07e4251a6a4..3395c5e64b7 100644 --- a/Mage.Sets/src/mage/cards/g/GiltLeafWinnower.java +++ b/Mage.Sets/src/mage/cards/g/GiltLeafWinnower.java @@ -25,7 +25,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class GiltLeafWinnower extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Elf creature whose power and toughness aren't equal"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Elf creature whose power and toughness aren't equal"); static { filter.add(Predicates.not(new SubtypePredicate(SubType.ELF))); diff --git a/Mage.Sets/src/mage/cards/g/GlimmerpointStag.java b/Mage.Sets/src/mage/cards/g/GlimmerpointStag.java index 4258c96d373..939b63db59c 100644 --- a/Mage.Sets/src/mage/cards/g/GlimmerpointStag.java +++ b/Mage.Sets/src/mage/cards/g/GlimmerpointStag.java @@ -30,7 +30,7 @@ import mage.target.targetpointer.FixedTarget; */ public final class GlimmerpointStag extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("another target permanent"); + private static final FilterPermanent filter = new FilterPermanent("another target permanent"); static { filter.add(AnotherPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/g/GnarlrootTrapper.java b/Mage.Sets/src/mage/cards/g/GnarlrootTrapper.java index a58d85839da..be62dc9f0f5 100644 --- a/Mage.Sets/src/mage/cards/g/GnarlrootTrapper.java +++ b/Mage.Sets/src/mage/cards/g/GnarlrootTrapper.java @@ -35,7 +35,7 @@ import java.util.UUID; */ public final class GnarlrootTrapper extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("attacking ELf you control"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("attacking ELf you control"); static { filter.add(AttackingPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/g/GoblinChainwhirler.java b/Mage.Sets/src/mage/cards/g/GoblinChainwhirler.java index b199353a7e0..9444c594518 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinChainwhirler.java +++ b/Mage.Sets/src/mage/cards/g/GoblinChainwhirler.java @@ -24,7 +24,7 @@ import mage.filter.predicate.permanent.ControllerPredicate; */ public final class GoblinChainwhirler extends CardImpl { - final static FilterPermanent filter = new FilterPermanent("creatures and planeswalkers your opponents control"); + static final FilterPermanent filter = new FilterPermanent("creatures and planeswalkers your opponents control"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/cards/g/GoblinTrenches.java b/Mage.Sets/src/mage/cards/g/GoblinTrenches.java index 5b3e4dc9449..1fa892e6106 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinTrenches.java +++ b/Mage.Sets/src/mage/cards/g/GoblinTrenches.java @@ -22,7 +22,7 @@ import mage.target.common.TargetControlledPermanent; */ public final class GoblinTrenches extends CardImpl { - final static FilterControlledPermanent filter = new FilterControlledLandPermanent("a land"); + static final FilterControlledPermanent filter = new FilterControlledLandPermanent("a land"); public GoblinTrenches(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}{W}"); diff --git a/Mage.Sets/src/mage/cards/g/Gomazoa.java b/Mage.Sets/src/mage/cards/g/Gomazoa.java index c6b38885841..b3163a4fda5 100644 --- a/Mage.Sets/src/mage/cards/g/Gomazoa.java +++ b/Mage.Sets/src/mage/cards/g/Gomazoa.java @@ -87,9 +87,8 @@ class GomazoaEffect extends OneShotEffect { } BlockedByWatcher watcher = game.getState().getWatcher(BlockedByWatcher.class, source.getSourceId()); - creaturesBlocked = watcher.blockedByWatcher; - for (UUID blockedById : creaturesBlocked) { + for (UUID blockedById : watcher.getBlockedByWatcher()) { Permanent blockedByGomazoa = game.getPermanent(blockedById); if (blockedByGomazoa != null && blockedByGomazoa.isAttacking()) { players.add(blockedByGomazoa.getOwnerId()); @@ -114,13 +113,17 @@ class GomazoaEffect extends OneShotEffect { class BlockedByWatcher extends Watcher { - public List blockedByWatcher = new ArrayList<>(); + public List getBlockedByWatcher() { + return blockedByWatcher; + } + + private List blockedByWatcher = new ArrayList<>(); public BlockedByWatcher() { super(BlockedByWatcher.class.getSimpleName(), WatcherScope.CARD); } - public BlockedByWatcher(final BlockedByWatcher watcher) { + private BlockedByWatcher(final BlockedByWatcher watcher) { super(watcher); this.blockedByWatcher.addAll(watcher.blockedByWatcher); } diff --git a/Mage.Sets/src/mage/cards/g/GraspingCurrent.java b/Mage.Sets/src/mage/cards/g/GraspingCurrent.java index 7d37e336b05..bc0c1719754 100644 --- a/Mage.Sets/src/mage/cards/g/GraspingCurrent.java +++ b/Mage.Sets/src/mage/cards/g/GraspingCurrent.java @@ -17,7 +17,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class GraspingCurrent extends CardImpl { - private final static FilterCard filter = new FilterCard("Jace, Ingenious Mind-Mage"); + private static final FilterCard filter = new FilterCard("Jace, Ingenious Mind-Mage"); static { filter.add(new NamePredicate("Jace, Ingenious Mind-Mage")); diff --git a/Mage.Sets/src/mage/cards/g/GravityNegator.java b/Mage.Sets/src/mage/cards/g/GravityNegator.java index 17673de97b7..e96d7f465a8 100644 --- a/Mage.Sets/src/mage/cards/g/GravityNegator.java +++ b/Mage.Sets/src/mage/cards/g/GravityNegator.java @@ -25,7 +25,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class GravityNegator extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature"); static { filter.add(AnotherPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/g/GravitySphere.java b/Mage.Sets/src/mage/cards/g/GravitySphere.java index 97871089dcc..e0fa620fd15 100644 --- a/Mage.Sets/src/mage/cards/g/GravitySphere.java +++ b/Mage.Sets/src/mage/cards/g/GravitySphere.java @@ -21,7 +21,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; */ public final class GravitySphere extends CardImpl { - final static private FilterPermanent filter = new FilterPermanent("All creatures"); + static final private FilterPermanent filter = new FilterPermanent("All creatures"); static { filter.add(new CardTypePredicate(CardType.CREATURE)); diff --git a/Mage.Sets/src/mage/cards/h/HagHedgeMage.java b/Mage.Sets/src/mage/cards/h/HagHedgeMage.java index ccbc85ed309..b7cd8bee854 100644 --- a/Mage.Sets/src/mage/cards/h/HagHedgeMage.java +++ b/Mage.Sets/src/mage/cards/h/HagHedgeMage.java @@ -26,8 +26,8 @@ import mage.target.common.TargetCardInYourGraveyard; */ public final class HagHedgeMage extends CardImpl { - private final static FilterLandPermanent filter = new FilterLandPermanent(); - private final static FilterLandPermanent filter2 = new FilterLandPermanent(); + private static final FilterLandPermanent filter = new FilterLandPermanent(); + private static final FilterLandPermanent filter2 = new FilterLandPermanent(); static { filter.add(new SubtypePredicate(SubType.SWAMP)); diff --git a/Mage.Sets/src/mage/cards/h/HammerOfNazahn.java b/Mage.Sets/src/mage/cards/h/HammerOfNazahn.java index 686f5165e3d..a973a49601e 100644 --- a/Mage.Sets/src/mage/cards/h/HammerOfNazahn.java +++ b/Mage.Sets/src/mage/cards/h/HammerOfNazahn.java @@ -33,7 +33,7 @@ import mage.target.common.TargetControlledCreaturePermanent; */ public final class HammerOfNazahn extends CardImpl { - private final static FilterEquipmentPermanent filter = new FilterEquipmentPermanent("{this} or another Equipment"); + private static final FilterEquipmentPermanent filter = new FilterEquipmentPermanent("{this} or another Equipment"); public HammerOfNazahn(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); diff --git a/Mage.Sets/src/mage/cards/h/HarbingerOfTheTides.java b/Mage.Sets/src/mage/cards/h/HarbingerOfTheTides.java index 407f1fe645c..b88edd61b70 100644 --- a/Mage.Sets/src/mage/cards/h/HarbingerOfTheTides.java +++ b/Mage.Sets/src/mage/cards/h/HarbingerOfTheTides.java @@ -24,7 +24,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class HarbingerOfTheTides extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature an opponent controls"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature an opponent controls"); static { filter.add(TappedPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/h/Havoc.java b/Mage.Sets/src/mage/cards/h/Havoc.java index 36f247a89d8..705d130dfd7 100644 --- a/Mage.Sets/src/mage/cards/h/Havoc.java +++ b/Mage.Sets/src/mage/cards/h/Havoc.java @@ -20,7 +20,7 @@ import mage.filter.predicate.mageobject.ColorPredicate; */ public final class Havoc extends CardImpl { - private final static FilterSpell filter = new FilterSpell("a white spell"); + private static final FilterSpell filter = new FilterSpell("a white spell"); static { filter.add(new ColorPredicate(ObjectColor.WHITE)); diff --git a/Mage.Sets/src/mage/cards/h/HazoretsUndyingFury.java b/Mage.Sets/src/mage/cards/h/HazoretsUndyingFury.java index da4bc9daf01..9c6f84ce5bc 100644 --- a/Mage.Sets/src/mage/cards/h/HazoretsUndyingFury.java +++ b/Mage.Sets/src/mage/cards/h/HazoretsUndyingFury.java @@ -60,7 +60,7 @@ public final class HazoretsUndyingFury extends CardImpl { class HazoretsUndyingFuryEffect extends OneShotEffect { - private final static FilterCard filter = new FilterCard("nonland cards with converted mana cost 5 or less"); + private static final FilterCard filter = new FilterCard("nonland cards with converted mana cost 5 or less"); static { filter.add(Predicates.not(new CardTypePredicate(CardType.LAND))); diff --git a/Mage.Sets/src/mage/cards/h/HeartWolf.java b/Mage.Sets/src/mage/cards/h/HeartWolf.java index 7409660149e..3c88995a5b0 100644 --- a/Mage.Sets/src/mage/cards/h/HeartWolf.java +++ b/Mage.Sets/src/mage/cards/h/HeartWolf.java @@ -33,7 +33,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class HeartWolf extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent(); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { filter.add(new SubtypePredicate(SubType.DWARF)); diff --git a/Mage.Sets/src/mage/cards/h/HedronAlignment.java b/Mage.Sets/src/mage/cards/h/HedronAlignment.java index 6a8f16e8a3a..15cc1101d32 100644 --- a/Mage.Sets/src/mage/cards/h/HedronAlignment.java +++ b/Mage.Sets/src/mage/cards/h/HedronAlignment.java @@ -54,8 +54,8 @@ public final class HedronAlignment extends CardImpl { class HedronAlignmentEffect extends OneShotEffect { - private final static FilterPermanent filterPermanent = new FilterPermanent(); - private final static FilterCard filterCard = new FilterCard(); + private static final FilterPermanent filterPermanent = new FilterPermanent(); + private static final FilterCard filterCard = new FilterCard(); static { filterPermanent.add(new NamePredicate("Hedron Alignment")); diff --git a/Mage.Sets/src/mage/cards/h/HematiteTalisman.java b/Mage.Sets/src/mage/cards/h/HematiteTalisman.java index bde61499bd3..9671fbf4f35 100644 --- a/Mage.Sets/src/mage/cards/h/HematiteTalisman.java +++ b/Mage.Sets/src/mage/cards/h/HematiteTalisman.java @@ -21,7 +21,7 @@ import mage.target.TargetPermanent; */ public final class HematiteTalisman extends CardImpl { - private final static FilterSpell filter = new FilterSpell("a red spell"); + private static final FilterSpell filter = new FilterSpell("a red spell"); static { filter.add(new ColorPredicate(ObjectColor.RED)); diff --git a/Mage.Sets/src/mage/cards/h/HiddenPredators.java b/Mage.Sets/src/mage/cards/h/HiddenPredators.java index 689c3237cfe..9ddb3d20034 100644 --- a/Mage.Sets/src/mage/cards/h/HiddenPredators.java +++ b/Mage.Sets/src/mage/cards/h/HiddenPredators.java @@ -44,7 +44,7 @@ public final class HiddenPredators extends CardImpl { class HiddenPredatorsStateTriggeredAbility extends StateTriggeredAbility { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent(); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/h/HieromancersCage.java b/Mage.Sets/src/mage/cards/h/HieromancersCage.java index 500f420a1f8..55c0c5366da 100644 --- a/Mage.Sets/src/mage/cards/h/HieromancersCage.java +++ b/Mage.Sets/src/mage/cards/h/HieromancersCage.java @@ -20,7 +20,7 @@ import mage.target.TargetPermanent; */ public final class HieromancersCage extends CardImpl { - private final static FilterNonlandPermanent filter = new FilterNonlandPermanent(); + private static final FilterNonlandPermanent filter = new FilterNonlandPermanent(); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/h/Hivestone.java b/Mage.Sets/src/mage/cards/h/Hivestone.java index 8f8831507c1..4617132c446 100644 --- a/Mage.Sets/src/mage/cards/h/Hivestone.java +++ b/Mage.Sets/src/mage/cards/h/Hivestone.java @@ -17,7 +17,7 @@ import mage.util.SubTypeList; */ public final class Hivestone extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures you control"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures you control"); static { filter.add(new ControllerPredicate(TargetController.YOU)); diff --git a/Mage.Sets/src/mage/cards/h/HondenOfCleansingFire.java b/Mage.Sets/src/mage/cards/h/HondenOfCleansingFire.java index 153452b9934..008c3899ef0 100644 --- a/Mage.Sets/src/mage/cards/h/HondenOfCleansingFire.java +++ b/Mage.Sets/src/mage/cards/h/HondenOfCleansingFire.java @@ -21,7 +21,7 @@ import java.util.UUID; */ public final class HondenOfCleansingFire extends CardImpl { - final static FilterControlledPermanent filter = new FilterControlledPermanent("Shrine"); + static final FilterControlledPermanent filter = new FilterControlledPermanent("Shrine"); static { filter.add(new SubtypePredicate(SubType.SHRINE)); diff --git a/Mage.Sets/src/mage/cards/h/HondenOfInfiniteRage.java b/Mage.Sets/src/mage/cards/h/HondenOfInfiniteRage.java index cb15e6262a7..e543cfea2ce 100644 --- a/Mage.Sets/src/mage/cards/h/HondenOfInfiniteRage.java +++ b/Mage.Sets/src/mage/cards/h/HondenOfInfiniteRage.java @@ -24,7 +24,7 @@ import java.util.UUID; */ public final class HondenOfInfiniteRage extends CardImpl { - final static FilterControlledPermanent filter = new FilterControlledPermanent("Shrine"); + static final FilterControlledPermanent filter = new FilterControlledPermanent("Shrine"); static { filter.add(new SubtypePredicate(SubType.SHRINE)); diff --git a/Mage.Sets/src/mage/cards/h/HondenOfLifesWeb.java b/Mage.Sets/src/mage/cards/h/HondenOfLifesWeb.java index 9fb8e848a76..82dd9e47210 100644 --- a/Mage.Sets/src/mage/cards/h/HondenOfLifesWeb.java +++ b/Mage.Sets/src/mage/cards/h/HondenOfLifesWeb.java @@ -22,7 +22,7 @@ import java.util.UUID; */ public final class HondenOfLifesWeb extends CardImpl { - final static FilterControlledPermanent filter = new FilterControlledPermanent("Shrine"); + static final FilterControlledPermanent filter = new FilterControlledPermanent("Shrine"); static { filter.add(new SubtypePredicate(SubType.SHRINE)); diff --git a/Mage.Sets/src/mage/cards/h/HondenOfNightsReach.java b/Mage.Sets/src/mage/cards/h/HondenOfNightsReach.java index 57a394f638f..74f72e34c99 100644 --- a/Mage.Sets/src/mage/cards/h/HondenOfNightsReach.java +++ b/Mage.Sets/src/mage/cards/h/HondenOfNightsReach.java @@ -23,7 +23,7 @@ import java.util.UUID; */ public final class HondenOfNightsReach extends CardImpl { - final static FilterControlledPermanent filter = new FilterControlledPermanent("Shrine"); + static final FilterControlledPermanent filter = new FilterControlledPermanent("Shrine"); static { filter.add(new SubtypePredicate(SubType.SHRINE)); diff --git a/Mage.Sets/src/mage/cards/h/HondenOfSeeingWinds.java b/Mage.Sets/src/mage/cards/h/HondenOfSeeingWinds.java index 97f4974fd41..d4954be5bbe 100644 --- a/Mage.Sets/src/mage/cards/h/HondenOfSeeingWinds.java +++ b/Mage.Sets/src/mage/cards/h/HondenOfSeeingWinds.java @@ -21,7 +21,7 @@ import java.util.UUID; */ public final class HondenOfSeeingWinds extends CardImpl { - final static FilterControlledPermanent filter = new FilterControlledPermanent("Shrine"); + static final FilterControlledPermanent filter = new FilterControlledPermanent("Shrine"); static { filter.add(new SubtypePredicate(SubType.SHRINE)); diff --git a/Mage.Sets/src/mage/cards/h/HoodedHorror.java b/Mage.Sets/src/mage/cards/h/HoodedHorror.java index fdf79b4f147..5afe72dec96 100644 --- a/Mage.Sets/src/mage/cards/h/HoodedHorror.java +++ b/Mage.Sets/src/mage/cards/h/HoodedHorror.java @@ -45,7 +45,7 @@ public final class HoodedHorror extends CardImpl { class HoodedHorrorCantBeBlockedEffect extends RestrictionEffect { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent(); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); public HoodedHorrorCantBeBlockedEffect() { super(Duration.WhileOnBattlefield); diff --git a/Mage.Sets/src/mage/cards/h/HordeAmbusher.java b/Mage.Sets/src/mage/cards/h/HordeAmbusher.java index 2f33326dbc3..74e88895dc2 100644 --- a/Mage.Sets/src/mage/cards/h/HordeAmbusher.java +++ b/Mage.Sets/src/mage/cards/h/HordeAmbusher.java @@ -28,7 +28,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class HordeAmbusher extends CardImpl { - private final static FilterCard filter = new FilterCard("a red card in your hand"); + private static final FilterCard filter = new FilterCard("a red card in your hand"); static { filter.add(new ColorPredicate(ObjectColor.RED)); } diff --git a/Mage.Sets/src/mage/cards/h/HordeOfNotions.java b/Mage.Sets/src/mage/cards/h/HordeOfNotions.java index a1f81ada04a..c532a8636e7 100644 --- a/Mage.Sets/src/mage/cards/h/HordeOfNotions.java +++ b/Mage.Sets/src/mage/cards/h/HordeOfNotions.java @@ -27,7 +27,7 @@ import mage.target.common.TargetCardInYourGraveyard; */ public final class HordeOfNotions extends CardImpl { - private final static FilterCard filter = new FilterCard("Elemental card from your graveyard"); + private static final FilterCard filter = new FilterCard("Elemental card from your graveyard"); static { filter.add(new SubtypePredicate(SubType.ELEMENTAL)); diff --git a/Mage.Sets/src/mage/cards/h/HostageTaker.java b/Mage.Sets/src/mage/cards/h/HostageTaker.java index bf8e4cd7ba6..2006065336c 100644 --- a/Mage.Sets/src/mage/cards/h/HostageTaker.java +++ b/Mage.Sets/src/mage/cards/h/HostageTaker.java @@ -38,7 +38,7 @@ import mage.util.CardUtil; */ public final class HostageTaker extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("another target artifact or creature"); + private static final FilterPermanent filter = new FilterPermanent("another target artifact or creature"); static { filter.add(AnotherPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/h/HoundOfTheFarbogs.java b/Mage.Sets/src/mage/cards/h/HoundOfTheFarbogs.java index f66fce35136..9206adf00fc 100644 --- a/Mage.Sets/src/mage/cards/h/HoundOfTheFarbogs.java +++ b/Mage.Sets/src/mage/cards/h/HoundOfTheFarbogs.java @@ -23,7 +23,7 @@ import mage.constants.Zone; */ public final class HoundOfTheFarbogs extends CardImpl { - final static private String RULE = "{this} has menace as long as there are four or more card types among cards in your graveyard"; + static final private String RULE = "{this} has menace as long as there are four or more card types among cards in your graveyard"; public HoundOfTheFarbogs(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{B}"); diff --git a/Mage.Sets/src/mage/cards/h/HungryLynx.java b/Mage.Sets/src/mage/cards/h/HungryLynx.java index fcd7a42ad1a..510456806f8 100644 --- a/Mage.Sets/src/mage/cards/h/HungryLynx.java +++ b/Mage.Sets/src/mage/cards/h/HungryLynx.java @@ -33,7 +33,7 @@ import mage.target.common.TargetOpponent; */ public final class HungryLynx extends CardImpl { - private final static FilterControlledCreaturePermanent filterCat = new FilterControlledCreaturePermanent("Cats"); + private static final FilterControlledCreaturePermanent filterCat = new FilterControlledCreaturePermanent("Cats"); static { filterCat.add(new SubtypePredicate(SubType.CAT)); } @@ -43,7 +43,7 @@ public final class HungryLynx extends CardImpl { filterProRat.add(new SubtypePredicate(SubType.RAT)); } - private final static FilterCreaturePermanent filterRat = new FilterCreaturePermanent("a Rat"); + private static final FilterCreaturePermanent filterRat = new FilterCreaturePermanent("a Rat"); static { filterRat.add(new SubtypePredicate(SubType.RAT)); } diff --git a/Mage.Sets/src/mage/cards/h/HydromorphGuardian.java b/Mage.Sets/src/mage/cards/h/HydromorphGuardian.java index e2e0ce0be08..4ed1b891f70 100644 --- a/Mage.Sets/src/mage/cards/h/HydromorphGuardian.java +++ b/Mage.Sets/src/mage/cards/h/HydromorphGuardian.java @@ -25,7 +25,7 @@ import mage.target.TargetSpell; */ public final class HydromorphGuardian extends CardImpl { - private final static FilterSpell filter = new FilterSpell("spell that targets one or more creatures you control"); + private static final FilterSpell filter = new FilterSpell("spell that targets one or more creatures you control"); static { filter.add(new TargetsPermanentPredicate(new FilterControlledCreaturePermanent())); diff --git a/Mage.Sets/src/mage/cards/h/HydromorphGull.java b/Mage.Sets/src/mage/cards/h/HydromorphGull.java index 999873891cd..8ad0d29c449 100644 --- a/Mage.Sets/src/mage/cards/h/HydromorphGull.java +++ b/Mage.Sets/src/mage/cards/h/HydromorphGull.java @@ -26,7 +26,7 @@ import mage.target.TargetSpell; */ public final class HydromorphGull extends CardImpl { - private final static FilterSpell filter = new FilterSpell("spell that targets one or more creatures you control"); + private static final FilterSpell filter = new FilterSpell("spell that targets one or more creatures you control"); static { filter.add(new TargetsPermanentPredicate(new FilterControlledCreaturePermanent())); diff --git a/Mage.Sets/src/mage/cards/i/IdentityThief.java b/Mage.Sets/src/mage/cards/i/IdentityThief.java index cfa04ef2f5f..1ba731dba64 100644 --- a/Mage.Sets/src/mage/cards/i/IdentityThief.java +++ b/Mage.Sets/src/mage/cards/i/IdentityThief.java @@ -34,7 +34,7 @@ import mage.target.targetpointer.FixedTarget; */ public final class IdentityThief extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("target nontoken creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("target nontoken creature"); static { filter.add(Predicates.not(TokenPredicate.instance)); diff --git a/Mage.Sets/src/mage/cards/i/ImmobilizerEldrazi.java b/Mage.Sets/src/mage/cards/i/ImmobilizerEldrazi.java index 80720c49bcf..3ddded171c8 100644 --- a/Mage.Sets/src/mage/cards/i/ImmobilizerEldrazi.java +++ b/Mage.Sets/src/mage/cards/i/ImmobilizerEldrazi.java @@ -25,7 +25,7 @@ import mage.game.Game; */ public final class ImmobilizerEldrazi extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Each creature with toughness greater than its power"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Each creature with toughness greater than its power"); static { filter.add(new ImmobilizerEldraziPredicate()); diff --git a/Mage.Sets/src/mage/cards/i/InfernalTribute.java b/Mage.Sets/src/mage/cards/i/InfernalTribute.java index 51a53d5c831..5402c969ab9 100644 --- a/Mage.Sets/src/mage/cards/i/InfernalTribute.java +++ b/Mage.Sets/src/mage/cards/i/InfernalTribute.java @@ -22,7 +22,7 @@ import mage.target.common.TargetControlledPermanent; */ public final class InfernalTribute extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("a nontoken permanent"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("a nontoken permanent"); static { filter.add(Predicates.not(TokenPredicate.instance)); diff --git a/Mage.Sets/src/mage/cards/i/Intervene.java b/Mage.Sets/src/mage/cards/i/Intervene.java index e4585a019e3..7fc9a864cce 100644 --- a/Mage.Sets/src/mage/cards/i/Intervene.java +++ b/Mage.Sets/src/mage/cards/i/Intervene.java @@ -17,7 +17,7 @@ import mage.target.TargetSpell; */ public final class Intervene extends CardImpl { - private final static FilterSpell filter = new FilterSpell("spell that targets a creature"); + private static final FilterSpell filter = new FilterSpell("spell that targets a creature"); static { filter.add(new TargetsPermanentPredicate(new FilterCreaturePermanent())); diff --git a/Mage.Sets/src/mage/cards/i/InvasiveSurgery.java b/Mage.Sets/src/mage/cards/i/InvasiveSurgery.java index 432597bd9c0..f071d979891 100644 --- a/Mage.Sets/src/mage/cards/i/InvasiveSurgery.java +++ b/Mage.Sets/src/mage/cards/i/InvasiveSurgery.java @@ -24,7 +24,7 @@ import mage.target.TargetSpell; */ public final class InvasiveSurgery extends CardImpl { - private final static FilterSpell filter = new FilterSpell("sorcery spell"); + private static final FilterSpell filter = new FilterSpell("sorcery spell"); static { filter.add(new CardTypePredicate(CardType.SORCERY)); diff --git a/Mage.Sets/src/mage/cards/i/IroncladSlayer.java b/Mage.Sets/src/mage/cards/i/IroncladSlayer.java index 7bd1a2382c7..2a020c38659 100644 --- a/Mage.Sets/src/mage/cards/i/IroncladSlayer.java +++ b/Mage.Sets/src/mage/cards/i/IroncladSlayer.java @@ -22,7 +22,7 @@ import mage.target.common.TargetCardInYourGraveyard; */ public final class IroncladSlayer extends CardImpl { - private final static FilterCard filter = new FilterCard("Aura or Equipment card from your graveyard"); + private static final FilterCard filter = new FilterCard("Aura or Equipment card from your graveyard"); static { filter.add(Predicates.or(new SubtypePredicate(SubType.AURA), new SubtypePredicate(SubType.EQUIPMENT))); diff --git a/Mage.Sets/src/mage/cards/i/IslandSanctuary.java b/Mage.Sets/src/mage/cards/i/IslandSanctuary.java index aabf94d6899..b5effdc0e10 100644 --- a/Mage.Sets/src/mage/cards/i/IslandSanctuary.java +++ b/Mage.Sets/src/mage/cards/i/IslandSanctuary.java @@ -47,7 +47,7 @@ public final class IslandSanctuary extends CardImpl { class IslandSanctuaryEffect extends ReplacementEffectImpl { - private final static FilterCreaturePermanent notFlyingorIslandwalkCreatures = new FilterCreaturePermanent("except by creatures with flying and/or islandwalk"); + private static final FilterCreaturePermanent notFlyingorIslandwalkCreatures = new FilterCreaturePermanent("except by creatures with flying and/or islandwalk"); static { notFlyingorIslandwalkCreatures.add(Predicates.not(new AbilityPredicate(FlyingAbility.class))); diff --git a/Mage.Sets/src/mage/cards/i/IsolationZone.java b/Mage.Sets/src/mage/cards/i/IsolationZone.java index 3867b799b91..3ae0ee0781c 100644 --- a/Mage.Sets/src/mage/cards/i/IsolationZone.java +++ b/Mage.Sets/src/mage/cards/i/IsolationZone.java @@ -28,7 +28,7 @@ import mage.util.CardUtil; */ public final class IsolationZone extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("creature or enchantment an opponent controls"); + private static final FilterPermanent filter = new FilterPermanent("creature or enchantment an opponent controls"); static { filter.add(Predicates.or(new CardTypePredicate(CardType.CREATURE), diff --git a/Mage.Sets/src/mage/cards/i/IxalansBinding.java b/Mage.Sets/src/mage/cards/i/IxalansBinding.java index 95be9e826b8..a1424f478f3 100644 --- a/Mage.Sets/src/mage/cards/i/IxalansBinding.java +++ b/Mage.Sets/src/mage/cards/i/IxalansBinding.java @@ -27,7 +27,7 @@ import java.util.UUID; */ public final class IxalansBinding extends CardImpl { - private final static FilterNonlandPermanent filter = new FilterNonlandPermanent(); + private static final FilterNonlandPermanent filter = new FilterNonlandPermanent(); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/k/KalonianTwingrove.java b/Mage.Sets/src/mage/cards/k/KalonianTwingrove.java index f30969c2793..e4628b30450 100644 --- a/Mage.Sets/src/mage/cards/k/KalonianTwingrove.java +++ b/Mage.Sets/src/mage/cards/k/KalonianTwingrove.java @@ -26,7 +26,7 @@ import mage.game.permanent.token.KalonianTwingroveTreefolkWarriorToken; */ public final class KalonianTwingrove extends CardImpl { - final static FilterControlledPermanent filterLands = new FilterControlledPermanent("Forests you control"); + static final FilterControlledPermanent filterLands = new FilterControlledPermanent("Forests you control"); static { filterLands.add(new SubtypePredicate(SubType.FOREST)); diff --git a/Mage.Sets/src/mage/cards/k/KorEntanglers.java b/Mage.Sets/src/mage/cards/k/KorEntanglers.java index 30a2b08e5e0..68281bfe4bc 100644 --- a/Mage.Sets/src/mage/cards/k/KorEntanglers.java +++ b/Mage.Sets/src/mage/cards/k/KorEntanglers.java @@ -21,7 +21,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class KorEntanglers extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/k/KothophedSoulHoarder.java b/Mage.Sets/src/mage/cards/k/KothophedSoulHoarder.java index bb9df93824a..2b3d30d85f8 100644 --- a/Mage.Sets/src/mage/cards/k/KothophedSoulHoarder.java +++ b/Mage.Sets/src/mage/cards/k/KothophedSoulHoarder.java @@ -31,7 +31,7 @@ import mage.players.Player; */ public final class KothophedSoulHoarder extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent(); + private static final FilterPermanent filter = new FilterPermanent(); static { filter.add(new OwnerPredicate(TargetController.NOT_YOU)); diff --git a/Mage.Sets/src/mage/cards/l/LapisLazuliTalisman.java b/Mage.Sets/src/mage/cards/l/LapisLazuliTalisman.java index 5a54db01e41..f94965c1a73 100644 --- a/Mage.Sets/src/mage/cards/l/LapisLazuliTalisman.java +++ b/Mage.Sets/src/mage/cards/l/LapisLazuliTalisman.java @@ -21,7 +21,7 @@ import mage.target.TargetPermanent; */ public final class LapisLazuliTalisman extends CardImpl { - private final static FilterSpell filter = new FilterSpell("a blue spell"); + private static final FilterSpell filter = new FilterSpell("a blue spell"); static { filter.add(new ColorPredicate(ObjectColor.BLUE)); diff --git a/Mage.Sets/src/mage/cards/l/LiberatingCombustion.java b/Mage.Sets/src/mage/cards/l/LiberatingCombustion.java index 3594272808a..339bdf95df6 100644 --- a/Mage.Sets/src/mage/cards/l/LiberatingCombustion.java +++ b/Mage.Sets/src/mage/cards/l/LiberatingCombustion.java @@ -17,7 +17,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class LiberatingCombustion extends CardImpl { - private final static FilterCard filter = new FilterCard("Chandra, Pyrogenius"); + private static final FilterCard filter = new FilterCard("Chandra, Pyrogenius"); static { filter.add(new NamePredicate("Chandra, Pyrogenius")); diff --git a/Mage.Sets/src/mage/cards/l/LightningCloud.java b/Mage.Sets/src/mage/cards/l/LightningCloud.java index ddd5835798a..d3aa563ea6b 100644 --- a/Mage.Sets/src/mage/cards/l/LightningCloud.java +++ b/Mage.Sets/src/mage/cards/l/LightningCloud.java @@ -21,7 +21,7 @@ import mage.target.common.TargetAnyTarget; */ public final class LightningCloud extends CardImpl { - private final static FilterSpell filter = new FilterSpell("a red spell"); + private static final FilterSpell filter = new FilterSpell("a red spell"); static { filter.add(new ColorPredicate(ObjectColor.RED)); diff --git a/Mage.Sets/src/mage/cards/l/LilianasInfluence.java b/Mage.Sets/src/mage/cards/l/LilianasInfluence.java index a9876a6855c..7ba1d7345a5 100644 --- a/Mage.Sets/src/mage/cards/l/LilianasInfluence.java +++ b/Mage.Sets/src/mage/cards/l/LilianasInfluence.java @@ -20,8 +20,8 @@ import mage.filter.predicate.permanent.ControllerPredicate; */ public final class LilianasInfluence extends CardImpl { - private final static FilterCard filter = new FilterCard("Liliana, Death Wielder"); - private final static FilterCreaturePermanent filterCreatures = new FilterCreaturePermanent("creature you don't control"); + private static final FilterCard filter = new FilterCard("Liliana, Death Wielder"); + private static final FilterCreaturePermanent filterCreatures = new FilterCreaturePermanent("creature you don't control"); static { filter.add(new NamePredicate("Liliana, Death Wielder")); diff --git a/Mage.Sets/src/mage/cards/m/MalachiteTalisman.java b/Mage.Sets/src/mage/cards/m/MalachiteTalisman.java index 35e2289a12e..fb71ecab761 100644 --- a/Mage.Sets/src/mage/cards/m/MalachiteTalisman.java +++ b/Mage.Sets/src/mage/cards/m/MalachiteTalisman.java @@ -21,7 +21,7 @@ import mage.target.TargetPermanent; */ public final class MalachiteTalisman extends CardImpl { - private final static FilterSpell filter = new FilterSpell("a green spell"); + private static final FilterSpell filter = new FilterSpell("a green spell"); static { filter.add(new ColorPredicate(ObjectColor.GREEN)); diff --git a/Mage.Sets/src/mage/cards/m/ManaWeb.java b/Mage.Sets/src/mage/cards/m/ManaWeb.java index 20c06c5a7fa..5fce3c5d7b1 100644 --- a/Mage.Sets/src/mage/cards/m/ManaWeb.java +++ b/Mage.Sets/src/mage/cards/m/ManaWeb.java @@ -85,7 +85,7 @@ class ManaWebTriggeredAbility extends TriggeredAbilityImpl { class ManaWebeffect extends OneShotEffect { - private final static FilterLandPermanent filter = new FilterLandPermanent("an opponent taps a land"); + private static final FilterLandPermanent filter = new FilterLandPermanent("an opponent taps a land"); public ManaWebeffect() { super(Outcome.Tap); diff --git a/Mage.Sets/src/mage/cards/m/MaraudingMaulhorn.java b/Mage.Sets/src/mage/cards/m/MaraudingMaulhorn.java index 389a96dd0f3..2aaf0d54082 100644 --- a/Mage.Sets/src/mage/cards/m/MaraudingMaulhorn.java +++ b/Mage.Sets/src/mage/cards/m/MaraudingMaulhorn.java @@ -20,7 +20,7 @@ import mage.filter.predicate.mageobject.NamePredicate; */ public final class MaraudingMaulhorn extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creature named Advocate of the Beast"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creature named Advocate of the Beast"); static { filter.add(new NamePredicate("Advocate of the Beast")); diff --git a/Mage.Sets/src/mage/cards/m/MausoleumHarpy.java b/Mage.Sets/src/mage/cards/m/MausoleumHarpy.java index 9d78d64c7fb..e1e100f8d9e 100644 --- a/Mage.Sets/src/mage/cards/m/MausoleumHarpy.java +++ b/Mage.Sets/src/mage/cards/m/MausoleumHarpy.java @@ -25,7 +25,7 @@ import java.util.UUID; */ public final class MausoleumHarpy extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature you control"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature you control"); static { filter.add(AnotherPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/m/MerchantsDockhand.java b/Mage.Sets/src/mage/cards/m/MerchantsDockhand.java index 6c160eca919..e6f65a9075b 100644 --- a/Mage.Sets/src/mage/cards/m/MerchantsDockhand.java +++ b/Mage.Sets/src/mage/cards/m/MerchantsDockhand.java @@ -112,7 +112,7 @@ class MerchantsDockhandEffect extends OneShotEffect { class TapXTargetCost extends VariableCostImpl { - final static FilterControlledArtifactPermanent filter = new FilterControlledArtifactPermanent("untapped artifacts you control"); + static final FilterControlledArtifactPermanent filter = new FilterControlledArtifactPermanent("untapped artifacts you control"); static { filter.add(Predicates.not(TappedPredicate.instance)); diff --git a/Mage.Sets/src/mage/cards/m/Mirrorworks.java b/Mage.Sets/src/mage/cards/m/Mirrorworks.java index c96992b9a42..95b8e4cc1d7 100644 --- a/Mage.Sets/src/mage/cards/m/Mirrorworks.java +++ b/Mage.Sets/src/mage/cards/m/Mirrorworks.java @@ -23,7 +23,7 @@ import mage.filter.predicate.permanent.TokenPredicate; */ public final class Mirrorworks extends CardImpl { - private final static FilterArtifactPermanent filter = new FilterArtifactPermanent("another nontoken artifact"); + private static final FilterArtifactPermanent filter = new FilterArtifactPermanent("another nontoken artifact"); static { filter.add(AnotherPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/m/MoltenSentry.java b/Mage.Sets/src/mage/cards/m/MoltenSentry.java index d39b4c15517..31ec8892fd9 100644 --- a/Mage.Sets/src/mage/cards/m/MoltenSentry.java +++ b/Mage.Sets/src/mage/cards/m/MoltenSentry.java @@ -25,7 +25,7 @@ import mage.players.Player; */ public final class MoltenSentry extends CardImpl { - private final static String rule = "As {this} enters the battlefield, flip a coin. If the coin comes up heads, {this} enters the battlefield as a " + private static final String rule = "As {this} enters the battlefield, flip a coin. If the coin comes up heads, {this} enters the battlefield as a " + "5/2 creature with haste. If it comes up tails, {this} enters the battlefield as a 2/5 creature with defender."; public MoltenSentry(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MoonlightHunt.java b/Mage.Sets/src/mage/cards/m/MoonlightHunt.java index 1a4d3aa743c..a5d51d980ec 100644 --- a/Mage.Sets/src/mage/cards/m/MoonlightHunt.java +++ b/Mage.Sets/src/mage/cards/m/MoonlightHunt.java @@ -25,7 +25,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class MoonlightHunt extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { filter.add(new ControllerPredicate(TargetController.NOT_YOU)); @@ -51,7 +51,7 @@ public final class MoonlightHunt extends CardImpl { class MoonlightHuntEffect extends OneShotEffect { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent(); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { filter.add(Predicates.or(new SubtypePredicate(SubType.WOLF), new SubtypePredicate(SubType.WEREWOLF))); diff --git a/Mage.Sets/src/mage/cards/m/MoriokScavenger.java b/Mage.Sets/src/mage/cards/m/MoriokScavenger.java index efc4865b8c8..a2ef0d47338 100644 --- a/Mage.Sets/src/mage/cards/m/MoriokScavenger.java +++ b/Mage.Sets/src/mage/cards/m/MoriokScavenger.java @@ -20,7 +20,7 @@ import mage.target.common.TargetCardInYourGraveyard; */ public final class MoriokScavenger extends CardImpl { - final static FilterCreatureCard filter = new FilterCreatureCard("artifact creature card from your graveyard"); + static final FilterCreatureCard filter = new FilterCreatureCard("artifact creature card from your graveyard"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/cards/m/MurderousCompulsion.java b/Mage.Sets/src/mage/cards/m/MurderousCompulsion.java index 5056353cdca..b26b8ec57fe 100644 --- a/Mage.Sets/src/mage/cards/m/MurderousCompulsion.java +++ b/Mage.Sets/src/mage/cards/m/MurderousCompulsion.java @@ -18,7 +18,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class MurderousCompulsion extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); static { filter.add(TappedPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/n/NacreTalisman.java b/Mage.Sets/src/mage/cards/n/NacreTalisman.java index e995f40a399..439180b1c72 100644 --- a/Mage.Sets/src/mage/cards/n/NacreTalisman.java +++ b/Mage.Sets/src/mage/cards/n/NacreTalisman.java @@ -21,7 +21,7 @@ import mage.target.TargetPermanent; */ public final class NacreTalisman extends CardImpl { - private final static FilterSpell filter = new FilterSpell("a white spell"); + private static final FilterSpell filter = new FilterSpell("a white spell"); static { filter.add(new ColorPredicate(ObjectColor.WHITE)); diff --git a/Mage.Sets/src/mage/cards/n/NaturesWay.java b/Mage.Sets/src/mage/cards/n/NaturesWay.java index 49d697e5f3b..ce8752367ca 100644 --- a/Mage.Sets/src/mage/cards/n/NaturesWay.java +++ b/Mage.Sets/src/mage/cards/n/NaturesWay.java @@ -23,7 +23,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class NaturesWay extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { filter.add(new ControllerPredicate(TargetController.NOT_YOU)); diff --git a/Mage.Sets/src/mage/cards/n/Necromancy.java b/Mage.Sets/src/mage/cards/n/Necromancy.java index fe12c03723a..50d87e1e836 100644 --- a/Mage.Sets/src/mage/cards/n/Necromancy.java +++ b/Mage.Sets/src/mage/cards/n/Necromancy.java @@ -138,7 +138,7 @@ class NecromancyLeavesBattlefieldTriggeredEffect extends OneShotEffect { class NecromancyChangeAbilityEffect extends ContinuousEffectImpl implements SourceEffect { - private final static Ability newAbility = new EnchantAbility("creature put onto the battlefield with Necromancy"); + private static final Ability newAbility = new EnchantAbility("creature put onto the battlefield with Necromancy"); static { newAbility.setRuleAtTheTop(true); diff --git a/Mage.Sets/src/mage/cards/n/NettlingImp.java b/Mage.Sets/src/mage/cards/n/NettlingImp.java index 54fb70dae42..c96717e7530 100644 --- a/Mage.Sets/src/mage/cards/n/NettlingImp.java +++ b/Mage.Sets/src/mage/cards/n/NettlingImp.java @@ -33,7 +33,7 @@ import mage.watchers.common.AttackedThisTurnWatcher; */ public final class NettlingImp extends CardImpl { - final static FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Wall"); + static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Wall"); static { filter.add(Predicates.not(new SubtypePredicate(SubType.WALL))); diff --git a/Mage.Sets/src/mage/cards/n/NeurokTransmuter.java b/Mage.Sets/src/mage/cards/n/NeurokTransmuter.java index 886d089c0b3..f7a8b2c2273 100644 --- a/Mage.Sets/src/mage/cards/n/NeurokTransmuter.java +++ b/Mage.Sets/src/mage/cards/n/NeurokTransmuter.java @@ -31,7 +31,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class NeurokTransmuter extends CardImpl { - final static FilterCreaturePermanent filter = new FilterCreaturePermanent("artifact creature"); + static final FilterCreaturePermanent filter = new FilterCreaturePermanent("artifact creature"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/cards/n/NiambiFaithfulHealer.java b/Mage.Sets/src/mage/cards/n/NiambiFaithfulHealer.java index 07ef2682dc0..eac1abe1521 100644 --- a/Mage.Sets/src/mage/cards/n/NiambiFaithfulHealer.java +++ b/Mage.Sets/src/mage/cards/n/NiambiFaithfulHealer.java @@ -19,7 +19,7 @@ import mage.filter.predicate.mageobject.NamePredicate; */ public final class NiambiFaithfulHealer extends CardImpl { - private final static FilterCard filter = new FilterCard("Teferi, Timebender"); + private static final FilterCard filter = new FilterCard("Teferi, Timebender"); static { filter.add(new NamePredicate("Teferi, Timebender")); diff --git a/Mage.Sets/src/mage/cards/n/NissasDefeat.java b/Mage.Sets/src/mage/cards/n/NissasDefeat.java index 09cbbdc2beb..829cbcd1edd 100644 --- a/Mage.Sets/src/mage/cards/n/NissasDefeat.java +++ b/Mage.Sets/src/mage/cards/n/NissasDefeat.java @@ -26,7 +26,7 @@ import mage.target.TargetPermanent; */ public final class NissasDefeat extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("Forest, green enchantment, or green planeswalker"); + private static final FilterPermanent filter = new FilterPermanent("Forest, green enchantment, or green planeswalker"); static { filter.add(Predicates.or(new SubtypePredicate(SubType.FOREST), diff --git a/Mage.Sets/src/mage/cards/n/NissasJudgment.java b/Mage.Sets/src/mage/cards/n/NissasJudgment.java index 554ddd8068c..cdb1103af43 100644 --- a/Mage.Sets/src/mage/cards/n/NissasJudgment.java +++ b/Mage.Sets/src/mage/cards/n/NissasJudgment.java @@ -27,7 +27,7 @@ import mage.target.targetpointer.SecondTargetPointer; */ public final class NissasJudgment extends CardImpl { - private final static FilterCreaturePermanent FILTER = new FilterCreaturePermanent("creature an opponent controls"); + private static final FilterCreaturePermanent FILTER = new FilterCreaturePermanent("creature an opponent controls"); static { FILTER.add(new ControllerPredicate(TargetController.OPPONENT)); @@ -59,8 +59,8 @@ public final class NissasJudgment extends CardImpl { class NissasJudgmentEffect extends OneShotEffect { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); - private final static FilterCreaturePermanent filterWithCounter = new FilterCreaturePermanent(); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); + private static final FilterCreaturePermanent filterWithCounter = new FilterCreaturePermanent(); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/n/NoggleHedgeMage.java b/Mage.Sets/src/mage/cards/n/NoggleHedgeMage.java index c117f727616..c459491f62e 100644 --- a/Mage.Sets/src/mage/cards/n/NoggleHedgeMage.java +++ b/Mage.Sets/src/mage/cards/n/NoggleHedgeMage.java @@ -27,8 +27,8 @@ import mage.target.common.TargetPlayerOrPlaneswalker; */ public final class NoggleHedgeMage extends CardImpl { - private final static FilterLandPermanent filter = new FilterLandPermanent(); - private final static FilterLandPermanent filter2 = new FilterLandPermanent(); + private static final FilterLandPermanent filter = new FilterLandPermanent(); + private static final FilterLandPermanent filter2 = new FilterLandPermanent(); static { filter.add(new SubtypePredicate(SubType.ISLAND)); diff --git a/Mage.Sets/src/mage/cards/n/NutCollector.java b/Mage.Sets/src/mage/cards/n/NutCollector.java index fc95c907353..69a240a6cdd 100644 --- a/Mage.Sets/src/mage/cards/n/NutCollector.java +++ b/Mage.Sets/src/mage/cards/n/NutCollector.java @@ -23,7 +23,7 @@ import mage.game.permanent.token.SquirrelToken; */ public final class NutCollector extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("squirrel"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("squirrel"); static { filter.add(new SubtypePredicate(SubType.SQUIRREL)); diff --git a/Mage.Sets/src/mage/cards/o/OathOfChandra.java b/Mage.Sets/src/mage/cards/o/OathOfChandra.java index a2a574a5e3d..b71fc7388ac 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfChandra.java +++ b/Mage.Sets/src/mage/cards/o/OathOfChandra.java @@ -30,7 +30,7 @@ import mage.watchers.Watcher; */ public final class OathOfChandra extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/o/OathOfLimDul.java b/Mage.Sets/src/mage/cards/o/OathOfLimDul.java index 2d3aa09c5a7..f650fe48156 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfLimDul.java +++ b/Mage.Sets/src/mage/cards/o/OathOfLimDul.java @@ -88,7 +88,7 @@ class OathOfLimDulTriggeredAbility extends TriggeredAbilityImpl { class OathOfLimDulEffect extends OneShotEffect { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("controlled permanent other than Oath of Lim-Dul"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("controlled permanent other than Oath of Lim-Dul"); static { filter.add(AnotherPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/o/OathOfNissa.java b/Mage.Sets/src/mage/cards/o/OathOfNissa.java index 514e75cb565..6f3fd0a6970 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfNissa.java +++ b/Mage.Sets/src/mage/cards/o/OathOfNissa.java @@ -48,7 +48,7 @@ public final class OathOfNissa extends CardImpl { class OathOfNissaEffect extends OneShotEffect { - private final static FilterCard filter = new FilterCard("a creature, land, or planeswalker card"); + private static final FilterCard filter = new FilterCard("a creature, land, or planeswalker card"); static { filter.add(Predicates.or(new CardTypePredicate(CardType.CREATURE), diff --git a/Mage.Sets/src/mage/cards/o/OathOfTeferi.java b/Mage.Sets/src/mage/cards/o/OathOfTeferi.java index db292a88a07..b71265aaf5f 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfTeferi.java +++ b/Mage.Sets/src/mage/cards/o/OathOfTeferi.java @@ -33,7 +33,7 @@ import mage.target.targetpointer.FixedTarget; */ public final class OathOfTeferi extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("another target permanent you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("another target permanent you control"); static { filter.add(AnotherPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/o/OgreBattledriver.java b/Mage.Sets/src/mage/cards/o/OgreBattledriver.java index 4986765662d..accee718865 100644 --- a/Mage.Sets/src/mage/cards/o/OgreBattledriver.java +++ b/Mage.Sets/src/mage/cards/o/OgreBattledriver.java @@ -26,7 +26,7 @@ import mage.filter.predicate.permanent.ControllerPredicate; */ public final class OgreBattledriver extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); static { filter.add(new ControllerPredicate(TargetController.YOU)); diff --git a/Mage.Sets/src/mage/cards/o/OnyxTalisman.java b/Mage.Sets/src/mage/cards/o/OnyxTalisman.java index 47beb9b9019..75d3edb13f7 100644 --- a/Mage.Sets/src/mage/cards/o/OnyxTalisman.java +++ b/Mage.Sets/src/mage/cards/o/OnyxTalisman.java @@ -21,7 +21,7 @@ import mage.target.TargetPermanent; */ public final class OnyxTalisman extends CardImpl { - private final static FilterSpell filter = new FilterSpell("a black spell"); + private static final FilterSpell filter = new FilterSpell("a black spell"); static { filter.add(new ColorPredicate(ObjectColor.BLACK)); diff --git a/Mage.Sets/src/mage/cards/o/OpenTheArmory.java b/Mage.Sets/src/mage/cards/o/OpenTheArmory.java index d529110cf8f..a0063c18b63 100644 --- a/Mage.Sets/src/mage/cards/o/OpenTheArmory.java +++ b/Mage.Sets/src/mage/cards/o/OpenTheArmory.java @@ -40,15 +40,15 @@ public final class OpenTheArmory extends CardImpl { class OpenTheArmoryTarget extends TargetCardInLibrary { - private static final FilterCard filter = new FilterCard("Aura or Equipment card"); + private static final FilterCard auraOrEquipmentTarget = new FilterCard("Aura or Equipment card"); static { - filter.add(Predicates.or( + auraOrEquipmentTarget.add(Predicates.or( new SubtypePredicate(SubType.EQUIPMENT), new SubtypePredicate(SubType.AURA))); } public OpenTheArmoryTarget() { - super(1, 1, filter.copy()); + super(1, 1, auraOrEquipmentTarget.copy()); } public OpenTheArmoryTarget(final OpenTheArmoryTarget target) { @@ -64,7 +64,7 @@ class OpenTheArmoryTarget extends TargetCardInLibrary { public boolean canTarget(UUID id, Cards cards, Game game) { Card card = cards.get(id, game); if (card != null) { - return filter.match(card, game); + return auraOrEquipmentTarget.match(card, game); } return false; } diff --git a/Mage.Sets/src/mage/cards/o/OrchardSpirit.java b/Mage.Sets/src/mage/cards/o/OrchardSpirit.java index f6d5dec0ff6..d022aacc943 100644 --- a/Mage.Sets/src/mage/cards/o/OrchardSpirit.java +++ b/Mage.Sets/src/mage/cards/o/OrchardSpirit.java @@ -22,7 +22,7 @@ import mage.filter.predicate.mageobject.AbilityPredicate; */ public final class OrchardSpirit extends CardImpl { - private final static FilterCreaturePermanent notFlyingorReachCreatures = new FilterCreaturePermanent("except by creatures with flying or reach"); + private static final FilterCreaturePermanent notFlyingorReachCreatures = new FilterCreaturePermanent("except by creatures with flying or reach"); static { notFlyingorReachCreatures.add(Predicates.not( diff --git a/Mage.Sets/src/mage/cards/o/OupheVandals.java b/Mage.Sets/src/mage/cards/o/OupheVandals.java index d4847067598..2c89a1075f5 100644 --- a/Mage.Sets/src/mage/cards/o/OupheVandals.java +++ b/Mage.Sets/src/mage/cards/o/OupheVandals.java @@ -32,7 +32,7 @@ import mage.target.common.TargetActivatedOrTriggeredAbility; */ public final class OupheVandals extends CardImpl { - private final static FilterStackObject filter = new FilterStackObject("ability from an artifact source"); + private static final FilterStackObject filter = new FilterStackObject("ability from an artifact source"); static { filter.add(new ArtifactSourcePredicate()); diff --git a/Mage.Sets/src/mage/cards/o/OutpostSiege.java b/Mage.Sets/src/mage/cards/o/OutpostSiege.java index 2fabfdbc093..4062fa1c786 100644 --- a/Mage.Sets/src/mage/cards/o/OutpostSiege.java +++ b/Mage.Sets/src/mage/cards/o/OutpostSiege.java @@ -35,8 +35,8 @@ import mage.target.targetpointer.FixedTarget; */ public final class OutpostSiege extends CardImpl { - private final static String ruleTrigger1 = "&bull Khans — At the beginning of your upkeep, exile the top card of your library. Until end of turn, you may play that card."; - private final static String ruleTrigger2 = "&bull Dragons — Whenever a creature you control leaves the battlefield, {this} deals 1 damage to any target."; + private static final String ruleTrigger1 = "&bull Khans — At the beginning of your upkeep, exile the top card of your library. Until end of turn, you may play that card."; + private static final String ruleTrigger2 = "&bull Dragons — Whenever a creature you control leaves the battlefield, {this} deals 1 damage to any target."; public OutpostSiege(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{R}"); diff --git a/Mage.Sets/src/mage/cards/p/PalaceJailer.java b/Mage.Sets/src/mage/cards/p/PalaceJailer.java index d2d832438a6..4ecbe074132 100644 --- a/Mage.Sets/src/mage/cards/p/PalaceJailer.java +++ b/Mage.Sets/src/mage/cards/p/PalaceJailer.java @@ -35,7 +35,7 @@ import mage.util.CardUtil; */ public final class PalaceJailer extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/p/PalaceSiege.java b/Mage.Sets/src/mage/cards/p/PalaceSiege.java index 97624a9c482..e73cefcb5e7 100644 --- a/Mage.Sets/src/mage/cards/p/PalaceSiege.java +++ b/Mage.Sets/src/mage/cards/p/PalaceSiege.java @@ -26,8 +26,8 @@ import java.util.UUID; */ public final class PalaceSiege extends CardImpl { - private final static String ruleTrigger1 = "&bull Khans — At the beginning of your upkeep, return target creature card from your graveyard to your hand."; - private final static String ruleTrigger2 = "&bull Dragons — At the beginning of your upkeep, each opponent loses 2 life and you gain 2 life."; + private static final String ruleTrigger1 = "&bull Khans — At the beginning of your upkeep, return target creature card from your graveyard to your hand."; + private static final String ruleTrigger2 = "&bull Dragons — At the beginning of your upkeep, each opponent loses 2 life and you gain 2 life."; public PalaceSiege(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{B}{B}"); diff --git a/Mage.Sets/src/mage/cards/p/PathOfMettle.java b/Mage.Sets/src/mage/cards/p/PathOfMettle.java index e2a2759b770..1e016aed39e 100644 --- a/Mage.Sets/src/mage/cards/p/PathOfMettle.java +++ b/Mage.Sets/src/mage/cards/p/PathOfMettle.java @@ -28,7 +28,7 @@ import mage.game.events.GameEvent; */ public final class PathOfMettle extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature that doesn't have first strike, double strike, vigilance, or haste"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature that doesn't have first strike, double strike, vigilance, or haste"); static { filter.add(Predicates.not(Predicates.or( @@ -67,7 +67,7 @@ public final class PathOfMettle extends CardImpl { class PathOfMettleTriggeredAbility extends TriggeredAbilityImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature that doesn't have first strike, double strike, vigilance, or haste"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature that doesn't have first strike, double strike, vigilance, or haste"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/cards/p/PeopleOfTheWoods.java b/Mage.Sets/src/mage/cards/p/PeopleOfTheWoods.java index 326d9fde0c9..3987f7b24e2 100644 --- a/Mage.Sets/src/mage/cards/p/PeopleOfTheWoods.java +++ b/Mage.Sets/src/mage/cards/p/PeopleOfTheWoods.java @@ -21,7 +21,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public final class PeopleOfTheWoods extends CardImpl { - final static FilterControlledPermanent filterLands = new FilterControlledPermanent("Forests you control"); + static final FilterControlledPermanent filterLands = new FilterControlledPermanent("Forests you control"); static { filterLands.add(new SubtypePredicate(SubType.FOREST)); diff --git a/Mage.Sets/src/mage/cards/p/PersonalEnergyShield.java b/Mage.Sets/src/mage/cards/p/PersonalEnergyShield.java index 9fe269d4162..dc6e98fe6ab 100644 --- a/Mage.Sets/src/mage/cards/p/PersonalEnergyShield.java +++ b/Mage.Sets/src/mage/cards/p/PersonalEnergyShield.java @@ -22,7 +22,7 @@ import mage.target.TargetSpell; */ public final class PersonalEnergyShield extends CardImpl { - private final static FilterSpell filter = new FilterSpell("spell that targets you or a permanent you control"); + private static final FilterSpell filter = new FilterSpell("spell that targets you or a permanent you control"); static { filter.add(new PersonalEnergyFieldPredicate()); diff --git a/Mage.Sets/src/mage/cards/p/PitilessPlunderer.java b/Mage.Sets/src/mage/cards/p/PitilessPlunderer.java index b4667a3b49b..38d5ac492ad 100644 --- a/Mage.Sets/src/mage/cards/p/PitilessPlunderer.java +++ b/Mage.Sets/src/mage/cards/p/PitilessPlunderer.java @@ -21,7 +21,7 @@ import mage.game.permanent.token.TreasureToken; */ public final class PitilessPlunderer extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature you control"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature you control"); static { filter.add(AnotherPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/p/PlanarOutburst.java b/Mage.Sets/src/mage/cards/p/PlanarOutburst.java index fab9b40eb52..0d7bfc485ab 100644 --- a/Mage.Sets/src/mage/cards/p/PlanarOutburst.java +++ b/Mage.Sets/src/mage/cards/p/PlanarOutburst.java @@ -17,7 +17,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; */ public final class PlanarOutburst extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("nonland creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nonland creatures"); static { filter.add(Predicates.not(new CardTypePredicate(CardType.LAND))); diff --git a/Mage.Sets/src/mage/cards/p/PoisonbellyOgre.java b/Mage.Sets/src/mage/cards/p/PoisonbellyOgre.java index 23b359686f8..111a72772d0 100644 --- a/Mage.Sets/src/mage/cards/p/PoisonbellyOgre.java +++ b/Mage.Sets/src/mage/cards/p/PoisonbellyOgre.java @@ -25,7 +25,7 @@ public final class PoisonbellyOgre extends CardImpl { filter.add(AnotherPredicate.instance); } - private final static String RULE = "Whenever another creature enters the battlefield, its controller loses 1 life."; + private static final String RULE = "Whenever another creature enters the battlefield, its controller loses 1 life."; public PoisonbellyOgre(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}"); diff --git a/Mage.Sets/src/mage/cards/p/Portcullis.java b/Mage.Sets/src/mage/cards/p/Portcullis.java index 5a5f9ae6006..1cddb7e13ed 100644 --- a/Mage.Sets/src/mage/cards/p/Portcullis.java +++ b/Mage.Sets/src/mage/cards/p/Portcullis.java @@ -34,7 +34,7 @@ import mage.util.CardUtil; */ public final class Portcullis extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature"); public Portcullis(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); diff --git a/Mage.Sets/src/mage/cards/p/PrimalForcemage.java b/Mage.Sets/src/mage/cards/p/PrimalForcemage.java index c1e50b811e9..954fd329c83 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalForcemage.java +++ b/Mage.Sets/src/mage/cards/p/PrimalForcemage.java @@ -23,7 +23,7 @@ import mage.filter.predicate.permanent.ControllerPredicate; */ public final class PrimalForcemage extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); static { filter.add(new ControllerPredicate(TargetController.YOU)); diff --git a/Mage.Sets/src/mage/cards/p/PrimalWellspring.java b/Mage.Sets/src/mage/cards/p/PrimalWellspring.java index 892fbbc636e..4c9667d9e02 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalWellspring.java +++ b/Mage.Sets/src/mage/cards/p/PrimalWellspring.java @@ -50,7 +50,7 @@ public final class PrimalWellspring extends CardImpl { class PyrimalWellspringTriggeredAbility extends TriggeredAbilityImpl { - private final static FilterInstantOrSorcerySpell filter = new FilterInstantOrSorcerySpell(); + private static final FilterInstantOrSorcerySpell filter = new FilterInstantOrSorcerySpell(); String abilityOriginalId; diff --git a/Mage.Sets/src/mage/cards/p/ProwlingNightstalker.java b/Mage.Sets/src/mage/cards/p/ProwlingNightstalker.java index 19279f4048c..59e6c5ccc4d 100644 --- a/Mage.Sets/src/mage/cards/p/ProwlingNightstalker.java +++ b/Mage.Sets/src/mage/cards/p/ProwlingNightstalker.java @@ -21,7 +21,7 @@ import mage.filter.predicate.mageobject.ColorPredicate; */ public final class ProwlingNightstalker extends CardImpl { - private final static FilterCreaturePermanent notBlackCreatures = new FilterCreaturePermanent("except by black creatures"); + private static final FilterCreaturePermanent notBlackCreatures = new FilterCreaturePermanent("except by black creatures"); static { notBlackCreatures.add(Predicates.not(new ColorPredicate(ObjectColor.BLACK))); diff --git a/Mage.Sets/src/mage/cards/p/PyromancersGoggles.java b/Mage.Sets/src/mage/cards/p/PyromancersGoggles.java index b26aed2ddde..f6f2ec08a5d 100644 --- a/Mage.Sets/src/mage/cards/p/PyromancersGoggles.java +++ b/Mage.Sets/src/mage/cards/p/PyromancersGoggles.java @@ -54,7 +54,7 @@ public final class PyromancersGoggles extends CardImpl { class PyromancersGogglesTriggeredAbility extends TriggeredAbilityImpl { - private final static FilterInstantOrSorcerySpell filter = new FilterInstantOrSorcerySpell(); + private static final FilterInstantOrSorcerySpell filter = new FilterInstantOrSorcerySpell(); static { filter.add(new ColorPredicate(ObjectColor.RED)); diff --git a/Mage.Sets/src/mage/cards/r/RadiantDestiny.java b/Mage.Sets/src/mage/cards/r/RadiantDestiny.java index acfbcefe7b9..b0b9bee0316 100644 --- a/Mage.Sets/src/mage/cards/r/RadiantDestiny.java +++ b/Mage.Sets/src/mage/cards/r/RadiantDestiny.java @@ -27,7 +27,7 @@ import static mage.filter.StaticFilters.FILTER_PERMANENT_CREATURES_CONTROLLED; */ public final class RadiantDestiny extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you control of the chosen type"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you control of the chosen type"); static { filter.add(new ControllerPredicate(TargetController.YOU)); diff --git a/Mage.Sets/src/mage/cards/r/RagingSwordtooth.java b/Mage.Sets/src/mage/cards/r/RagingSwordtooth.java index 5856a612a88..1363ae5ba06 100644 --- a/Mage.Sets/src/mage/cards/r/RagingSwordtooth.java +++ b/Mage.Sets/src/mage/cards/r/RagingSwordtooth.java @@ -19,7 +19,7 @@ import mage.filter.predicate.permanent.AnotherPredicate; */ public final class RagingSwordtooth extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("other creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("other creature"); static { filter.add(AnotherPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/r/RalsDispersal.java b/Mage.Sets/src/mage/cards/r/RalsDispersal.java index 4747d592aa0..224d594843b 100644 --- a/Mage.Sets/src/mage/cards/r/RalsDispersal.java +++ b/Mage.Sets/src/mage/cards/r/RalsDispersal.java @@ -16,7 +16,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class RalsDispersal extends CardImpl { - private final static FilterCard filter = new FilterCard("Ral, Caller of Storms"); + private static final FilterCard filter = new FilterCard("Ral, Caller of Storms"); static { filter.add(new NamePredicate("Ral, Caller of Storms")); diff --git a/Mage.Sets/src/mage/cards/r/RamunapHydra.java b/Mage.Sets/src/mage/cards/r/RamunapHydra.java index 7e74d67d64c..38a86af7688 100644 --- a/Mage.Sets/src/mage/cards/r/RamunapHydra.java +++ b/Mage.Sets/src/mage/cards/r/RamunapHydra.java @@ -68,7 +68,7 @@ public final class RamunapHydra extends CardImpl { class RamunapHydraBoostEffect extends WhileConditionContinuousEffect { - private final static FilterCard filter = new FilterCard("a Desert"); + private static final FilterCard filter = new FilterCard("a Desert"); static { filter.add(new SubtypePredicate(SubType.DESERT)); diff --git a/Mage.Sets/src/mage/cards/r/RebuffTheWicked.java b/Mage.Sets/src/mage/cards/r/RebuffTheWicked.java index d5ecd01df48..e60d29822b0 100644 --- a/Mage.Sets/src/mage/cards/r/RebuffTheWicked.java +++ b/Mage.Sets/src/mage/cards/r/RebuffTheWicked.java @@ -17,7 +17,7 @@ import mage.target.TargetSpell; */ public final class RebuffTheWicked extends CardImpl { - private final static FilterSpell filter = new FilterSpell("spell that targets a permanent you control"); + private static final FilterSpell filter = new FilterSpell("spell that targets a permanent you control"); static { filter.add(new TargetsPermanentPredicate(new FilterControlledPermanent())); diff --git a/Mage.Sets/src/mage/cards/r/RecklessBushwhacker.java b/Mage.Sets/src/mage/cards/r/RecklessBushwhacker.java index d19cf75607c..c35a7128698 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessBushwhacker.java +++ b/Mage.Sets/src/mage/cards/r/RecklessBushwhacker.java @@ -24,7 +24,7 @@ import mage.filter.predicate.permanent.AnotherPredicate; */ public final class RecklessBushwhacker extends CardImpl { - private final static FilterControlledCreaturePermanent FILTER = new FilterControlledCreaturePermanent("other creatures you control"); + private static final FilterControlledCreaturePermanent FILTER = new FilterControlledCreaturePermanent("other creatures you control"); static { FILTER.add(AnotherPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/r/RecklessCohort.java b/Mage.Sets/src/mage/cards/r/RecklessCohort.java index 4962f5b3ce8..a4f00f9e922 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessCohort.java +++ b/Mage.Sets/src/mage/cards/r/RecklessCohort.java @@ -21,7 +21,7 @@ import mage.filter.predicate.permanent.AnotherPredicate; */ public final class RecklessCohort extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another Ally"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another Ally"); static { filter.add(AnotherPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/r/ReflectorMage.java b/Mage.Sets/src/mage/cards/r/ReflectorMage.java index a7a087b19e2..51ebede343e 100644 --- a/Mage.Sets/src/mage/cards/r/ReflectorMage.java +++ b/Mage.Sets/src/mage/cards/r/ReflectorMage.java @@ -27,7 +27,7 @@ import java.util.UUID; */ public final class ReflectorMage extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent(); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/r/RemorselessPunishment.java b/Mage.Sets/src/mage/cards/r/RemorselessPunishment.java index 3bfd103007b..56387c62954 100644 --- a/Mage.Sets/src/mage/cards/r/RemorselessPunishment.java +++ b/Mage.Sets/src/mage/cards/r/RemorselessPunishment.java @@ -43,7 +43,7 @@ public final class RemorselessPunishment extends CardImpl { class RemorselessPunishmentEffect extends OneShotEffect { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("creature or planeswalker"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("creature or planeswalker"); static { filter.add(Predicates.or(new CardTypePredicate(CardType.CREATURE), new CardTypePredicate(CardType.PLANESWALKER))); diff --git a/Mage.Sets/src/mage/cards/r/RhythmicWaterVortex.java b/Mage.Sets/src/mage/cards/r/RhythmicWaterVortex.java index 01f4b225acf..412162b3f40 100644 --- a/Mage.Sets/src/mage/cards/r/RhythmicWaterVortex.java +++ b/Mage.Sets/src/mage/cards/r/RhythmicWaterVortex.java @@ -16,7 +16,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class RhythmicWaterVortex extends CardImpl { - private final static FilterCard filter = new FilterCard("Mu Yanling"); + private static final FilterCard filter = new FilterCard("Mu Yanling"); static { filter.add(new NamePredicate("Mu Yanling")); diff --git a/Mage.Sets/src/mage/cards/r/RingOfImmortals.java b/Mage.Sets/src/mage/cards/r/RingOfImmortals.java index 3d61da68c22..bca0f2387d0 100644 --- a/Mage.Sets/src/mage/cards/r/RingOfImmortals.java +++ b/Mage.Sets/src/mage/cards/r/RingOfImmortals.java @@ -26,7 +26,7 @@ import mage.target.TargetSpell; */ public final class RingOfImmortals extends CardImpl { - private final static FilterSpell filter = new FilterSpell("instant or Aura spell that targets a permanent you control"); + private static final FilterSpell filter = new FilterSpell("instant or Aura spell that targets a permanent you control"); static { filter.add(Predicates.or(new CardTypePredicate(CardType.INSTANT), new SubtypePredicate(SubType.AURA))); diff --git a/Mage.Sets/src/mage/cards/r/RiptideLaboratory.java b/Mage.Sets/src/mage/cards/r/RiptideLaboratory.java index dc0eeae9843..049835c8ed8 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideLaboratory.java +++ b/Mage.Sets/src/mage/cards/r/RiptideLaboratory.java @@ -23,7 +23,7 @@ import mage.target.common.TargetControlledPermanent; */ public final class RiptideLaboratory extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("Wizard you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("Wizard you control"); static { filter.add(new SubtypePredicate(SubType.WIZARD)); diff --git a/Mage.Sets/src/mage/cards/r/RoilingWaters.java b/Mage.Sets/src/mage/cards/r/RoilingWaters.java index e0ba7dd30b9..a6d1d69d836 100644 --- a/Mage.Sets/src/mage/cards/r/RoilingWaters.java +++ b/Mage.Sets/src/mage/cards/r/RoilingWaters.java @@ -21,7 +21,7 @@ import mage.target.targetpointer.SecondTargetPointer; */ public final class RoilingWaters extends CardImpl { - private final static FilterCreaturePermanent FILTER = new FilterCreaturePermanent("creatures your opponents control"); + private static final FilterCreaturePermanent FILTER = new FilterCreaturePermanent("creatures your opponents control"); static { FILTER.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/r/RoilmagesTrick.java b/Mage.Sets/src/mage/cards/r/RoilmagesTrick.java index b4af39f406a..496d1bd6a7b 100644 --- a/Mage.Sets/src/mage/cards/r/RoilmagesTrick.java +++ b/Mage.Sets/src/mage/cards/r/RoilmagesTrick.java @@ -22,7 +22,7 @@ import mage.filter.predicate.permanent.ControllerPredicate; */ public final class RoilmagesTrick extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control"); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/r/RootsOfLife.java b/Mage.Sets/src/mage/cards/r/RootsOfLife.java index 419f1d62352..c3f2cba6d69 100644 --- a/Mage.Sets/src/mage/cards/r/RootsOfLife.java +++ b/Mage.Sets/src/mage/cards/r/RootsOfLife.java @@ -22,8 +22,8 @@ import mage.filter.predicate.permanent.ControllerPredicate; */ public final class RootsOfLife extends CardImpl { - private final static String ruleTrigger1 = "&bull Island — Whenever an Island an opponent controls becomes tapped, you gain 1 life"; - private final static String ruleTrigger2 = "&bull Swamp — Whenever a Swamp an opponent controls becomes tapped, you gain 1 life"; + private static final String ruleTrigger1 = "&bull Island — Whenever an Island an opponent controls becomes tapped, you gain 1 life"; + private static final String ruleTrigger2 = "&bull Swamp — Whenever a Swamp an opponent controls becomes tapped, you gain 1 life"; private static final FilterPermanent islandFilter = new FilterPermanent("an Island an opponent controls"); private static final FilterPermanent swampFilter = new FilterPermanent("a Swamp an opponent controls"); diff --git a/Mage.Sets/src/mage/cards/r/RotShambler.java b/Mage.Sets/src/mage/cards/r/RotShambler.java index 8358cd49b08..1230e092c33 100644 --- a/Mage.Sets/src/mage/cards/r/RotShambler.java +++ b/Mage.Sets/src/mage/cards/r/RotShambler.java @@ -21,7 +21,7 @@ import mage.filter.predicate.permanent.ControllerPredicate; */ public final class RotShambler extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature you control"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature you control"); static { filter.add(AnotherPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/r/RuinInTheirWake.java b/Mage.Sets/src/mage/cards/r/RuinInTheirWake.java index 0d574c796ae..a4e9705c67f 100644 --- a/Mage.Sets/src/mage/cards/r/RuinInTheirWake.java +++ b/Mage.Sets/src/mage/cards/r/RuinInTheirWake.java @@ -45,7 +45,7 @@ public final class RuinInTheirWake extends CardImpl { class RuinInTheirWakeEffect extends OneShotEffect { - private final static FilterLandPermanent filterWastes = new FilterLandPermanent(); + private static final FilterLandPermanent filterWastes = new FilterLandPermanent(); static { filterWastes.add(new NamePredicate("Wastes")); diff --git a/Mage.Sets/src/mage/cards/r/RuinsOfOranRief.java b/Mage.Sets/src/mage/cards/r/RuinsOfOranRief.java index b43ee672514..47d2869fdc0 100644 --- a/Mage.Sets/src/mage/cards/r/RuinsOfOranRief.java +++ b/Mage.Sets/src/mage/cards/r/RuinsOfOranRief.java @@ -24,7 +24,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class RuinsOfOranRief extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("colorless creature that entered the battlefield this turn"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("colorless creature that entered the battlefield this turn"); static { filter.add(ColorlessPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/r/Rust.java b/Mage.Sets/src/mage/cards/r/Rust.java index 1e88687beb4..9557ecb1edd 100644 --- a/Mage.Sets/src/mage/cards/r/Rust.java +++ b/Mage.Sets/src/mage/cards/r/Rust.java @@ -17,7 +17,7 @@ import mage.target.common.TargetActivatedAbility; */ public final class Rust extends CardImpl { - private final static FilterStackObject filter = new FilterStackObject("activated ability from an artifact source"); + private static final FilterStackObject filter = new FilterStackObject("activated ability from an artifact source"); static { filter.add(new ArtifactSourcePredicate()); diff --git a/Mage.Sets/src/mage/cards/r/RuthlessRipper.java b/Mage.Sets/src/mage/cards/r/RuthlessRipper.java index d58fb8cc922..936b2a7f521 100644 --- a/Mage.Sets/src/mage/cards/r/RuthlessRipper.java +++ b/Mage.Sets/src/mage/cards/r/RuthlessRipper.java @@ -26,7 +26,7 @@ import mage.target.common.TargetCardInHand; */ public final class RuthlessRipper extends CardImpl { - private final static FilterCard filter = new FilterCard("a black card in your hand"); + private static final FilterCard filter = new FilterCard("a black card in your hand"); static { filter.add(new ColorPredicate(ObjectColor.BLACK)); } diff --git a/Mage.Sets/src/mage/cards/s/SaddlebackLagac.java b/Mage.Sets/src/mage/cards/s/SaddlebackLagac.java index 70c1b8ab3e2..715fe21771d 100644 --- a/Mage.Sets/src/mage/cards/s/SaddlebackLagac.java +++ b/Mage.Sets/src/mage/cards/s/SaddlebackLagac.java @@ -20,7 +20,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class SaddlebackLagac extends CardImpl { - private final static FilterCreaturePermanent FILTER = new FilterCreaturePermanent("target creatures"); + private static final FilterCreaturePermanent FILTER = new FilterCreaturePermanent("target creatures"); static { FILTER.add(AnotherPredicate.instance); @@ -39,7 +39,7 @@ public final class SaddlebackLagac extends CardImpl { } - public SaddlebackLagac(final SaddlebackLagac card) { + private SaddlebackLagac(final SaddlebackLagac card) { super(card); } diff --git a/Mage.Sets/src/mage/cards/s/SaiTok.java b/Mage.Sets/src/mage/cards/s/SaiTok.java index 04d1f9daa49..2fea4bab8d8 100644 --- a/Mage.Sets/src/mage/cards/s/SaiTok.java +++ b/Mage.Sets/src/mage/cards/s/SaiTok.java @@ -11,7 +11,6 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.target.TargetPermanent; -import mage.target.common.TargetCreatureOrPlaneswalker; /** * @@ -36,7 +35,7 @@ public final class SaiTok extends CardImpl { this.getSpellAbility().addTarget(new TargetPermanent(filter)); } - public SaiTok(final SaiTok card) { + private SaiTok(final SaiTok card) { super(card); } diff --git a/Mage.Sets/src/mage/cards/s/Sailmonger.java b/Mage.Sets/src/mage/cards/s/Sailmonger.java index 738b1ecf8a7..ec6d781bac8 100644 --- a/Mage.Sets/src/mage/cards/s/Sailmonger.java +++ b/Mage.Sets/src/mage/cards/s/Sailmonger.java @@ -3,7 +3,6 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.InfoEffect; diff --git a/Mage.Sets/src/mage/cards/s/Saltblast.java b/Mage.Sets/src/mage/cards/s/Saltblast.java index 66945dea2fa..a17a04cf6b9 100644 --- a/Mage.Sets/src/mage/cards/s/Saltblast.java +++ b/Mage.Sets/src/mage/cards/s/Saltblast.java @@ -1,7 +1,6 @@ package mage.cards.s; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; @@ -12,18 +11,21 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class Saltblast extends CardImpl { - static final protected FilterPermanent filter = new FilterPermanent("nonwhite permanent"); + private static final FilterPermanent filter = new FilterPermanent("nonwhite permanent"); + static { filter.add(Predicates.not(new ColorPredicate(ObjectColor.WHITE))); } + public Saltblast(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{W}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{W}{W}"); // Destroy target nonwhite permanent. diff --git a/Mage.Sets/src/mage/cards/s/Scapeshift.java b/Mage.Sets/src/mage/cards/s/Scapeshift.java index 7cf2a9cee6d..473044dfbd2 100644 --- a/Mage.Sets/src/mage/cards/s/Scapeshift.java +++ b/Mage.Sets/src/mage/cards/s/Scapeshift.java @@ -66,8 +66,8 @@ class ScapeshiftEffect extends OneShotEffect { int amount = 0; TargetControlledPermanent sacrificeLand = new TargetControlledPermanent(0, Integer.MAX_VALUE, new FilterControlledLandPermanent("lands you control"), true); if (controller.chooseTarget(Outcome.Sacrifice, sacrificeLand, source, game)) { - for (Object uuid : sacrificeLand.getTargets()) { - Permanent land = game.getPermanent((UUID) uuid); + for (UUID uuid : sacrificeLand.getTargets()) { + Permanent land = game.getPermanent(uuid); if (land != null) { land.sacrifice(source.getSourceId(), game); amount++; diff --git a/Mage.Sets/src/mage/cards/s/ScourgeOfValkas.java b/Mage.Sets/src/mage/cards/s/ScourgeOfValkas.java index 2e3a2d02773..d762ba2de59 100644 --- a/Mage.Sets/src/mage/cards/s/ScourgeOfValkas.java +++ b/Mage.Sets/src/mage/cards/s/ScourgeOfValkas.java @@ -31,7 +31,7 @@ import mage.target.common.TargetAnyTarget; */ public final class ScourgeOfValkas extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("{this} or another Dragon"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("{this} or another Dragon"); static { filter.add(new SubtypePredicate(SubType.DRAGON)); diff --git a/Mage.Sets/src/mage/cards/s/ScreechingSliver.java b/Mage.Sets/src/mage/cards/s/ScreechingSliver.java index afff09d73a9..908ef9eda5e 100644 --- a/Mage.Sets/src/mage/cards/s/ScreechingSliver.java +++ b/Mage.Sets/src/mage/cards/s/ScreechingSliver.java @@ -23,7 +23,7 @@ import mage.target.TargetPlayer; */ public final class ScreechingSliver extends CardImpl { - private static final FilterPermanent filter = new FilterPermanent(SubType.SLIVER, "All Slivers"); + private static final FilterPermanent allSliversFilter = new FilterPermanent(SubType.SLIVER, "All Slivers"); public ScreechingSliver(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{U}"); @@ -37,7 +37,7 @@ public final class ScreechingSliver extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, - filter, "All Slivers have \"{T}: Target player puts the top card of their library into their graveyard.\""))); + allSliversFilter, "All Slivers have \"{T}: Target player puts the top card of their library into their graveyard.\""))); } public ScreechingSliver(final ScreechingSliver card) { diff --git a/Mage.Sets/src/mage/cards/s/SealAway.java b/Mage.Sets/src/mage/cards/s/SealAway.java index 4550db53198..9ad8ab7f25a 100644 --- a/Mage.Sets/src/mage/cards/s/SealAway.java +++ b/Mage.Sets/src/mage/cards/s/SealAway.java @@ -24,7 +24,7 @@ import mage.target.TargetPermanent; */ public final class SealAway extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/s/Seedtime.java b/Mage.Sets/src/mage/cards/s/Seedtime.java index 1fe0480be89..efa5e33ce82 100644 --- a/Mage.Sets/src/mage/cards/s/Seedtime.java +++ b/Mage.Sets/src/mage/cards/s/Seedtime.java @@ -22,8 +22,8 @@ import mage.watchers.common.SpellsCastWatcher; */ public final class Seedtime extends CardImpl { - private final static String rule = "Cast this spell only during your turn."; - private final static String rule2 = "Take an extra turn after this one if an opponent cast a blue spell this turn."; + private static final String rule = "Cast this spell only during your turn."; + private static final String rule2 = "Take an extra turn after this one if an opponent cast a blue spell this turn."; public Seedtime(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{G}"); diff --git a/Mage.Sets/src/mage/cards/s/SentinelOfThePearlTrident.java b/Mage.Sets/src/mage/cards/s/SentinelOfThePearlTrident.java index 93db168b201..97a6036248a 100644 --- a/Mage.Sets/src/mage/cards/s/SentinelOfThePearlTrident.java +++ b/Mage.Sets/src/mage/cards/s/SentinelOfThePearlTrident.java @@ -30,7 +30,7 @@ import mage.target.targetpointer.FixedTarget; */ public final class SentinelOfThePearlTrident extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("historic permanent you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("historic permanent you control"); static { filter.add(HistoricPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/s/SerraInquisitors.java b/Mage.Sets/src/mage/cards/s/SerraInquisitors.java index dacf3b265cd..afb01197666 100644 --- a/Mage.Sets/src/mage/cards/s/SerraInquisitors.java +++ b/Mage.Sets/src/mage/cards/s/SerraInquisitors.java @@ -20,7 +20,7 @@ import java.util.UUID; */ public final class SerraInquisitors extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("black creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("black creatures"); static { filter.add(new ColorPredicate(ObjectColor.BLACK)); diff --git a/Mage.Sets/src/mage/cards/s/SetonKrosanProtector.java b/Mage.Sets/src/mage/cards/s/SetonKrosanProtector.java index 8c4af9f18d7..41fc8d67f03 100644 --- a/Mage.Sets/src/mage/cards/s/SetonKrosanProtector.java +++ b/Mage.Sets/src/mage/cards/s/SetonKrosanProtector.java @@ -24,7 +24,7 @@ import mage.target.common.TargetControlledCreaturePermanent; */ public final class SetonKrosanProtector extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Druid you control"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Druid you control"); static { filter.add(Predicates.not(TappedPredicate.instance)); diff --git a/Mage.Sets/src/mage/cards/s/ShaakHerd.java b/Mage.Sets/src/mage/cards/s/ShaakHerd.java index f4405e96216..96f3933057f 100644 --- a/Mage.Sets/src/mage/cards/s/ShaakHerd.java +++ b/Mage.Sets/src/mage/cards/s/ShaakHerd.java @@ -20,7 +20,7 @@ import mage.target.common.TargetCardInYourGraveyard; */ public final class ShaakHerd extends CardImpl { - private final static FilterCard filter = new FilterCard("another target creature card"); + private static final FilterCard filter = new FilterCard("another target creature card"); static { filter.add(new AnotherCardPredicate()); diff --git a/Mage.Sets/src/mage/cards/s/SheerDrop.java b/Mage.Sets/src/mage/cards/s/SheerDrop.java index de325c267f2..2e4abc4c43f 100644 --- a/Mage.Sets/src/mage/cards/s/SheerDrop.java +++ b/Mage.Sets/src/mage/cards/s/SheerDrop.java @@ -17,7 +17,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class SheerDrop extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); static { filter.add(TappedPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/s/ShredsOfSanity.java b/Mage.Sets/src/mage/cards/s/ShredsOfSanity.java index 00536e942ec..172af9fbd32 100644 --- a/Mage.Sets/src/mage/cards/s/ShredsOfSanity.java +++ b/Mage.Sets/src/mage/cards/s/ShredsOfSanity.java @@ -25,8 +25,8 @@ import mage.target.TargetCard; */ public final class ShredsOfSanity extends CardImpl { - private final static FilterCard filterInstant = new FilterCard("an instant card in your graveyard"); - private final static FilterCard filterSorcery = new FilterCard("a sorcery card in your graveyard"); + private static final FilterCard filterInstant = new FilterCard("an instant card in your graveyard"); + private static final FilterCard filterSorcery = new FilterCard("a sorcery card in your graveyard"); static { filterInstant.add(new CardTypePredicate(CardType.INSTANT)); diff --git a/Mage.Sets/src/mage/cards/s/SigardasAid.java b/Mage.Sets/src/mage/cards/s/SigardasAid.java index d2be5aacd4e..8b7a18df427 100644 --- a/Mage.Sets/src/mage/cards/s/SigardasAid.java +++ b/Mage.Sets/src/mage/cards/s/SigardasAid.java @@ -25,7 +25,7 @@ import mage.target.common.TargetControlledCreaturePermanent; */ public final class SigardasAid extends CardImpl { - private final static FilterArtifactPermanent filter = new FilterArtifactPermanent("an Equipment"); + private static final FilterArtifactPermanent filter = new FilterArtifactPermanent("an Equipment"); private static final FilterCard filterCard = new FilterCard("Aura and Equipment spells"); static { diff --git a/Mage.Sets/src/mage/cards/s/SignalPest.java b/Mage.Sets/src/mage/cards/s/SignalPest.java index ea2b26fdec4..dab7642273c 100644 --- a/Mage.Sets/src/mage/cards/s/SignalPest.java +++ b/Mage.Sets/src/mage/cards/s/SignalPest.java @@ -23,7 +23,7 @@ import mage.filter.predicate.mageobject.AbilityPredicate; */ public final class SignalPest extends CardImpl { - private final static FilterCreaturePermanent notFlyingorReachCreatures = new FilterCreaturePermanent("except by creatures with flying or reach"); + private static final FilterCreaturePermanent notFlyingorReachCreatures = new FilterCreaturePermanent("except by creatures with flying or reach"); static { notFlyingorReachCreatures.add(Predicates.not( diff --git a/Mage.Sets/src/mage/cards/s/SnakePit.java b/Mage.Sets/src/mage/cards/s/SnakePit.java index b2d173c76bd..a7a108f0241 100644 --- a/Mage.Sets/src/mage/cards/s/SnakePit.java +++ b/Mage.Sets/src/mage/cards/s/SnakePit.java @@ -19,7 +19,7 @@ import mage.game.permanent.token.SnakeToken; */ public final class SnakePit extends CardImpl { - private final static FilterSpell filter = new FilterSpell("a blue or black spell"); + private static final FilterSpell filter = new FilterSpell("a blue or black spell"); static { filter.add(Predicates.or(new ColorPredicate(ObjectColor.BLUE), new ColorPredicate(ObjectColor.BLACK))); diff --git a/Mage.Sets/src/mage/cards/s/SomberwaldAlpha.java b/Mage.Sets/src/mage/cards/s/SomberwaldAlpha.java index da9c48a8d0c..00bc7f78f48 100644 --- a/Mage.Sets/src/mage/cards/s/SomberwaldAlpha.java +++ b/Mage.Sets/src/mage/cards/s/SomberwaldAlpha.java @@ -28,7 +28,7 @@ import mage.target.common.TargetControlledCreaturePermanent; */ public final class SomberwaldAlpha extends CardImpl { - final static private FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature you control"); + static final private FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature you control"); static { filter.add(new ControllerPredicate(TargetController.YOU)); diff --git a/Mage.Sets/src/mage/cards/s/SoultetherGolem.java b/Mage.Sets/src/mage/cards/s/SoultetherGolem.java index 73d60c1aab6..3c449c87704 100644 --- a/Mage.Sets/src/mage/cards/s/SoultetherGolem.java +++ b/Mage.Sets/src/mage/cards/s/SoultetherGolem.java @@ -26,7 +26,7 @@ import mage.filter.predicate.permanent.ControllerPredicate; */ public final class SoultetherGolem extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); static { filter.add(new ControllerPredicate(TargetController.YOU)); diff --git a/Mage.Sets/src/mage/cards/s/SpellQueller.java b/Mage.Sets/src/mage/cards/s/SpellQueller.java index c4a1fb4c422..4077e32f870 100644 --- a/Mage.Sets/src/mage/cards/s/SpellQueller.java +++ b/Mage.Sets/src/mage/cards/s/SpellQueller.java @@ -37,7 +37,7 @@ import org.apache.log4j.Logger; */ public final class SpellQueller extends CardImpl { - private final static FilterSpell filter = new FilterSpell("spell with converted mana cost 4 or less"); + private static final FilterSpell filter = new FilterSpell("spell with converted mana cost 4 or less"); static { filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 5)); diff --git a/Mage.Sets/src/mage/cards/s/StasisSnare.java b/Mage.Sets/src/mage/cards/s/StasisSnare.java index 7dac21eb62f..fe7447f46cb 100644 --- a/Mage.Sets/src/mage/cards/s/StasisSnare.java +++ b/Mage.Sets/src/mage/cards/s/StasisSnare.java @@ -22,7 +22,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class StasisSnare extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent(); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/s/StensiaInnkeeper.java b/Mage.Sets/src/mage/cards/s/StensiaInnkeeper.java index dd254e1a64a..f6c5033a8ed 100644 --- a/Mage.Sets/src/mage/cards/s/StensiaInnkeeper.java +++ b/Mage.Sets/src/mage/cards/s/StensiaInnkeeper.java @@ -22,7 +22,7 @@ import mage.target.TargetPermanent; */ public final class StensiaInnkeeper extends CardImpl { - private final static FilterLandPermanent filter = new FilterLandPermanent("land an opponent controls"); + private static final FilterLandPermanent filter = new FilterLandPermanent("land an opponent controls"); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/s/SubterraneanShambler.java b/Mage.Sets/src/mage/cards/s/SubterraneanShambler.java index 29004308bd3..37166d93da9 100644 --- a/Mage.Sets/src/mage/cards/s/SubterraneanShambler.java +++ b/Mage.Sets/src/mage/cards/s/SubterraneanShambler.java @@ -21,7 +21,7 @@ import mage.filter.predicate.mageobject.AbilityPredicate; */ public final class SubterraneanShambler extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature without flying"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature without flying"); static { filter.add(Predicates.not(new AbilityPredicate(FlyingAbility.class))); diff --git a/Mage.Sets/src/mage/cards/s/SunBlessedMount.java b/Mage.Sets/src/mage/cards/s/SunBlessedMount.java index 2e94ae4ef0a..0a8b7f4f888 100644 --- a/Mage.Sets/src/mage/cards/s/SunBlessedMount.java +++ b/Mage.Sets/src/mage/cards/s/SunBlessedMount.java @@ -18,7 +18,7 @@ import mage.filter.predicate.mageobject.NamePredicate; */ public final class SunBlessedMount extends CardImpl { - private final static FilterCard filter = new FilterCard("Huatli, Dinosaur Knight"); + private static final FilterCard filter = new FilterCard("Huatli, Dinosaur Knight"); static { filter.add(new NamePredicate("Huatli, Dinosaur Knight")); diff --git a/Mage.Sets/src/mage/cards/s/SuspensionField.java b/Mage.Sets/src/mage/cards/s/SuspensionField.java index e7a8c8e5ce8..77cc6b30afd 100644 --- a/Mage.Sets/src/mage/cards/s/SuspensionField.java +++ b/Mage.Sets/src/mage/cards/s/SuspensionField.java @@ -26,7 +26,7 @@ import mage.util.CardUtil; */ public final class SuspensionField extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with toughness 3 or greater"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with toughness 3 or greater"); static { filter.add(new ToughnessPredicate(ComparisonType.MORE_THAN, 2)); diff --git a/Mage.Sets/src/mage/cards/s/SwiftReckoning.java b/Mage.Sets/src/mage/cards/s/SwiftReckoning.java index 3d252b1d339..c0b12aa4844 100644 --- a/Mage.Sets/src/mage/cards/s/SwiftReckoning.java +++ b/Mage.Sets/src/mage/cards/s/SwiftReckoning.java @@ -23,7 +23,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class SwiftReckoning extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); static { filter.add(TappedPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/t/TamiyoFieldResearcher.java b/Mage.Sets/src/mage/cards/t/TamiyoFieldResearcher.java index 1df9e2de403..17039e4b9c5 100644 --- a/Mage.Sets/src/mage/cards/t/TamiyoFieldResearcher.java +++ b/Mage.Sets/src/mage/cards/t/TamiyoFieldResearcher.java @@ -41,7 +41,7 @@ import mage.constants.SuperType; */ public final class TamiyoFieldResearcher extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("nonland permanent"); + private static final FilterPermanent filter = new FilterPermanent("nonland permanent"); static { filter.add(Predicates.not(new CardTypePredicate(CardType.LAND))); diff --git a/Mage.Sets/src/mage/cards/t/TawnosUrzasApprentice.java b/Mage.Sets/src/mage/cards/t/TawnosUrzasApprentice.java index e4db5140e72..7d3c450c2b1 100644 --- a/Mage.Sets/src/mage/cards/t/TawnosUrzasApprentice.java +++ b/Mage.Sets/src/mage/cards/t/TawnosUrzasApprentice.java @@ -31,7 +31,7 @@ import mage.target.common.TargetActivatedOrTriggeredAbility; */ public final class TawnosUrzasApprentice extends CardImpl { - private final static FilterStackObject filter = new FilterStackObject("activated or triggered ability you control from an artifact source"); + private static final FilterStackObject filter = new FilterStackObject("activated or triggered ability you control from an artifact source"); static { filter.add(new ArtifactSourcePredicate()); diff --git a/Mage.Sets/src/mage/cards/t/TeferisResponse.java b/Mage.Sets/src/mage/cards/t/TeferisResponse.java index 02d0f25d556..7c9ad386bac 100644 --- a/Mage.Sets/src/mage/cards/t/TeferisResponse.java +++ b/Mage.Sets/src/mage/cards/t/TeferisResponse.java @@ -23,7 +23,7 @@ import mage.target.TargetStackObject; */ public final class TeferisResponse extends CardImpl { - private final static FilterStackObject filter = new FilterStackObject("spell or ability an opponent controls that targets a land you control"); + private static final FilterStackObject filter = new FilterStackObject("spell or ability an opponent controls that targets a land you control"); static { filter.add(new TargetsPermanentPredicate(new FilterControlledLandPermanent())); diff --git a/Mage.Sets/src/mage/cards/t/TelJiladStylus.java b/Mage.Sets/src/mage/cards/t/TelJiladStylus.java index 886fa089ec8..5b252c5b960 100644 --- a/Mage.Sets/src/mage/cards/t/TelJiladStylus.java +++ b/Mage.Sets/src/mage/cards/t/TelJiladStylus.java @@ -22,7 +22,7 @@ import mage.target.TargetPermanent; */ public final class TelJiladStylus extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent(); + private static final FilterPermanent filter = new FilterPermanent(); static { filter.add(new OwnerPredicate(TargetController.YOU)); diff --git a/Mage.Sets/src/mage/cards/t/TelJiladWolf.java b/Mage.Sets/src/mage/cards/t/TelJiladWolf.java index 77a3482fb52..92ea7f3f7ef 100644 --- a/Mage.Sets/src/mage/cards/t/TelJiladWolf.java +++ b/Mage.Sets/src/mage/cards/t/TelJiladWolf.java @@ -19,7 +19,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; */ public final class TelJiladWolf extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("artifact creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("artifact creature"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/cards/t/TemurBattleRage.java b/Mage.Sets/src/mage/cards/t/TemurBattleRage.java index 1ec9a35e8a8..48b5c1d021a 100644 --- a/Mage.Sets/src/mage/cards/t/TemurBattleRage.java +++ b/Mage.Sets/src/mage/cards/t/TemurBattleRage.java @@ -20,7 +20,7 @@ import java.util.UUID; */ public final class TemurBattleRage extends CardImpl { - private final static String rule = "
Ferocious — That creature also gains trample until end of turn if you control a creature with power 4 or greater"; + private static final String rule = "
Ferocious — That creature also gains trample until end of turn if you control a creature with power 4 or greater"; public TemurBattleRage(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{R}"); diff --git a/Mage.Sets/src/mage/cards/t/TeysaOrzhovScion.java b/Mage.Sets/src/mage/cards/t/TeysaOrzhovScion.java index 41a5b34afd5..4a880fc119b 100644 --- a/Mage.Sets/src/mage/cards/t/TeysaOrzhovScion.java +++ b/Mage.Sets/src/mage/cards/t/TeysaOrzhovScion.java @@ -32,8 +32,8 @@ import mage.target.common.TargetCreaturePermanent; */ public final class TeysaOrzhovScion extends CardImpl { - private final static FilterControlledCreaturePermanent filterWhite = new FilterControlledCreaturePermanent("three white creatures"); - private final static FilterCreaturePermanent filterBlack = new FilterCreaturePermanent("another black creature you control"); + private static final FilterControlledCreaturePermanent filterWhite = new FilterControlledCreaturePermanent("three white creatures"); + private static final FilterCreaturePermanent filterBlack = new FilterCreaturePermanent("another black creature you control"); static { filterWhite.add(new ColorPredicate(ObjectColor.WHITE)); filterBlack.add(new ColorPredicate(ObjectColor.BLACK)); diff --git a/Mage.Sets/src/mage/cards/t/TezzeretsBetrayal.java b/Mage.Sets/src/mage/cards/t/TezzeretsBetrayal.java index f1fc8b79ff8..01e5a3be62b 100644 --- a/Mage.Sets/src/mage/cards/t/TezzeretsBetrayal.java +++ b/Mage.Sets/src/mage/cards/t/TezzeretsBetrayal.java @@ -17,7 +17,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class TezzeretsBetrayal extends CardImpl { - private final static FilterCard filter = new FilterCard("Tezzeret, Master of Metal"); + private static final FilterCard filter = new FilterCard("Tezzeret, Master of Metal"); static { filter.add(new NamePredicate("Tezzeret, Master of Metal")); diff --git a/Mage.Sets/src/mage/cards/t/ThirstingAxe.java b/Mage.Sets/src/mage/cards/t/ThirstingAxe.java index fe76f099210..169a5151ecf 100644 --- a/Mage.Sets/src/mage/cards/t/ThirstingAxe.java +++ b/Mage.Sets/src/mage/cards/t/ThirstingAxe.java @@ -85,7 +85,7 @@ class CombatDamageToCreatureWatcher extends Watcher { // which objects dealt combat damage to creature during the turn public final Set dealtCombatDamageToCreature; - final static String BASIC_KEY = "CombatDamageToCreatureWatcher"; + static final String BASIC_KEY = "CombatDamageToCreatureWatcher"; public CombatDamageToCreatureWatcher() { super(BASIC_KEY, WatcherScope.GAME); diff --git a/Mage.Sets/src/mage/cards/t/ThopterArrest.java b/Mage.Sets/src/mage/cards/t/ThopterArrest.java index 292158dab19..a5b154d32f5 100644 --- a/Mage.Sets/src/mage/cards/t/ThopterArrest.java +++ b/Mage.Sets/src/mage/cards/t/ThopterArrest.java @@ -23,7 +23,7 @@ import mage.target.TargetPermanent; */ public final class ThopterArrest extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact or creature"); + private static final FilterPermanent filter = new FilterPermanent("artifact or creature"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/cards/t/ThornbowArcher.java b/Mage.Sets/src/mage/cards/t/ThornbowArcher.java index b2ceb7a5ced..6122a804c16 100644 --- a/Mage.Sets/src/mage/cards/t/ThornbowArcher.java +++ b/Mage.Sets/src/mage/cards/t/ThornbowArcher.java @@ -45,7 +45,7 @@ public final class ThornbowArcher extends CardImpl { class ThornbowArcherEffect extends OneShotEffect { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent(); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { filter.add(new SubtypePredicate(SubType.ELF)); diff --git a/Mage.Sets/src/mage/cards/t/ThundermawHellkite.java b/Mage.Sets/src/mage/cards/t/ThundermawHellkite.java index dfd5ac5b255..24fdde1e704 100644 --- a/Mage.Sets/src/mage/cards/t/ThundermawHellkite.java +++ b/Mage.Sets/src/mage/cards/t/ThundermawHellkite.java @@ -27,7 +27,7 @@ import mage.game.permanent.Permanent; */ public final class ThundermawHellkite extends CardImpl { - final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures with flying your opponents control"); + static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures with flying your opponents control"); static { filter.add(new AbilityPredicate(FlyingAbility.class)); diff --git a/Mage.Sets/src/mage/cards/t/TrapjawTyrant.java b/Mage.Sets/src/mage/cards/t/TrapjawTyrant.java index dbe78a66680..c1ad6180aad 100644 --- a/Mage.Sets/src/mage/cards/t/TrapjawTyrant.java +++ b/Mage.Sets/src/mage/cards/t/TrapjawTyrant.java @@ -24,7 +24,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class TrapjawTyrant extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent(); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/t/TreefolkSeedlings.java b/Mage.Sets/src/mage/cards/t/TreefolkSeedlings.java index 46e8aa7f4f8..94bc6cf9f1f 100644 --- a/Mage.Sets/src/mage/cards/t/TreefolkSeedlings.java +++ b/Mage.Sets/src/mage/cards/t/TreefolkSeedlings.java @@ -21,7 +21,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public final class TreefolkSeedlings extends CardImpl { - final static FilterControlledPermanent filterLands = new FilterControlledPermanent("Forests you control"); + static final FilterControlledPermanent filterLands = new FilterControlledPermanent("Forests you control"); static { filterLands.add(new SubtypePredicate(SubType.FOREST)); diff --git a/Mage.Sets/src/mage/cards/t/TreetopRangers.java b/Mage.Sets/src/mage/cards/t/TreetopRangers.java index 647b8b99348..63f331dea0d 100644 --- a/Mage.Sets/src/mage/cards/t/TreetopRangers.java +++ b/Mage.Sets/src/mage/cards/t/TreetopRangers.java @@ -22,7 +22,7 @@ import mage.filter.predicate.mageobject.AbilityPredicate; */ public final class TreetopRangers extends CardImpl { - private final static FilterCreaturePermanent onlyFlyingCreatures = new FilterCreaturePermanent("except by creatures with flying"); + private static final FilterCreaturePermanent onlyFlyingCreatures = new FilterCreaturePermanent("except by creatures with flying"); static { onlyFlyingCreatures.add(Predicates.not(new AbilityPredicate(FlyingAbility.class))); diff --git a/Mage.Sets/src/mage/cards/t/TreetopScout.java b/Mage.Sets/src/mage/cards/t/TreetopScout.java index ea02bc2b9e1..52068cc52fd 100644 --- a/Mage.Sets/src/mage/cards/t/TreetopScout.java +++ b/Mage.Sets/src/mage/cards/t/TreetopScout.java @@ -22,7 +22,7 @@ import mage.filter.predicate.mageobject.AbilityPredicate; */ public final class TreetopScout extends CardImpl { - private final static FilterCreaturePermanent onlyFlyingCreatures = new FilterCreaturePermanent("except by creatures with flying"); + private static final FilterCreaturePermanent onlyFlyingCreatures = new FilterCreaturePermanent("except by creatures with flying"); static { onlyFlyingCreatures.add(Predicates.not(new AbilityPredicate(FlyingAbility.class))); diff --git a/Mage.Sets/src/mage/cards/t/TurnAside.java b/Mage.Sets/src/mage/cards/t/TurnAside.java index 600493961b9..245b76b035e 100644 --- a/Mage.Sets/src/mage/cards/t/TurnAside.java +++ b/Mage.Sets/src/mage/cards/t/TurnAside.java @@ -18,7 +18,7 @@ import mage.target.TargetSpell; */ public final class TurnAside extends CardImpl { - private final static FilterSpell filter = new FilterSpell("spell that targets a permanent you control"); + private static final FilterSpell filter = new FilterSpell("spell that targets a permanent you control"); static { filter.add(new TargetsPermanentPredicate(new FilterControlledPermanent())); diff --git a/Mage.Sets/src/mage/cards/u/UlamogsDespoiler.java b/Mage.Sets/src/mage/cards/u/UlamogsDespoiler.java index 2852a710440..8db6e24f69c 100644 --- a/Mage.Sets/src/mage/cards/u/UlamogsDespoiler.java +++ b/Mage.Sets/src/mage/cards/u/UlamogsDespoiler.java @@ -54,7 +54,7 @@ public final class UlamogsDespoiler extends CardImpl { class UlamogsDespoilerEffect extends OneShotEffect { - private final static FilterCard filter = new FilterCard("cards your opponents own from exile"); + private static final FilterCard filter = new FilterCard("cards your opponents own from exile"); static { filter.add(new OwnerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/u/UlamogsNullifier.java b/Mage.Sets/src/mage/cards/u/UlamogsNullifier.java index 730bf0835e3..3490922e624 100644 --- a/Mage.Sets/src/mage/cards/u/UlamogsNullifier.java +++ b/Mage.Sets/src/mage/cards/u/UlamogsNullifier.java @@ -68,7 +68,7 @@ public final class UlamogsNullifier extends CardImpl { class UlamogsNullifierEffect extends OneShotEffect { - private final static FilterCard filter = new FilterCard("cards your opponents own from exile"); + private static final FilterCard filter = new FilterCard("cards your opponents own from exile"); static { filter.add(new OwnerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/u/UnravelingMummy.java b/Mage.Sets/src/mage/cards/u/UnravelingMummy.java index ff8bf52ac88..b995e43ca50 100644 --- a/Mage.Sets/src/mage/cards/u/UnravelingMummy.java +++ b/Mage.Sets/src/mage/cards/u/UnravelingMummy.java @@ -27,7 +27,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class UnravelingMummy extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("attacking Zombie"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("attacking Zombie"); static { filter.add(AttackingPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/u/UnstableShapeshifter.java b/Mage.Sets/src/mage/cards/u/UnstableShapeshifter.java index 7b29054aaaa..d91b45043f2 100644 --- a/Mage.Sets/src/mage/cards/u/UnstableShapeshifter.java +++ b/Mage.Sets/src/mage/cards/u/UnstableShapeshifter.java @@ -27,7 +27,7 @@ import mage.util.functions.EmptyApplyToPermanent; */ public final class UnstableShapeshifter extends CardImpl { - final static FilterCreaturePermanent filterAnotherCreature = new FilterCreaturePermanent("another creature"); + static final FilterCreaturePermanent filterAnotherCreature = new FilterCreaturePermanent("another creature"); static { filterAnotherCreature.add(AnotherPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/u/UnstoppableAsh.java b/Mage.Sets/src/mage/cards/u/UnstoppableAsh.java index 6ab5dcab8e7..791a81e9be2 100644 --- a/Mage.Sets/src/mage/cards/u/UnstoppableAsh.java +++ b/Mage.Sets/src/mage/cards/u/UnstoppableAsh.java @@ -25,7 +25,7 @@ import mage.filter.predicate.permanent.ControllerPredicate; */ public final class UnstoppableAsh extends CardImpl { - final static private FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature you control"); + static final private FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature you control"); static { filter.add(new ControllerPredicate(TargetController.YOU)); diff --git a/Mage.Sets/src/mage/cards/v/VanquishersBanner.java b/Mage.Sets/src/mage/cards/v/VanquishersBanner.java index 63a8cfd65d3..9c935e622c7 100644 --- a/Mage.Sets/src/mage/cards/v/VanquishersBanner.java +++ b/Mage.Sets/src/mage/cards/v/VanquishersBanner.java @@ -29,7 +29,7 @@ import mage.game.stack.Spell; */ public final class VanquishersBanner extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you control of the chosen type"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you control of the chosen type"); static { filter.add(new ControllerPredicate(TargetController.YOU)); diff --git a/Mage.Sets/src/mage/cards/v/VastwoodAnimist.java b/Mage.Sets/src/mage/cards/v/VastwoodAnimist.java index c2de9d7915f..cf9572a5933 100644 --- a/Mage.Sets/src/mage/cards/v/VastwoodAnimist.java +++ b/Mage.Sets/src/mage/cards/v/VastwoodAnimist.java @@ -54,7 +54,7 @@ public final class VastwoodAnimist extends CardImpl { class VastwoodAnimistEffect extends OneShotEffect { - final static FilterControlledPermanent filterAllies = new FilterControlledPermanent("allies you control"); + static final FilterControlledPermanent filterAllies = new FilterControlledPermanent("allies you control"); static { filterAllies.add(new SubtypePredicate(SubType.ALLY)); diff --git a/Mage.Sets/src/mage/cards/v/VelaTheNightClad.java b/Mage.Sets/src/mage/cards/v/VelaTheNightClad.java index 299bbcb1a5e..8e9015bf3fc 100644 --- a/Mage.Sets/src/mage/cards/v/VelaTheNightClad.java +++ b/Mage.Sets/src/mage/cards/v/VelaTheNightClad.java @@ -22,7 +22,7 @@ import mage.filter.predicate.permanent.ControllerPredicate; */ public final class VelaTheNightClad extends CardImpl { - private final static String rule = "Whenever {this} or another creature you control leaves the battlefield, "; + private static final String rule = "Whenever {this} or another creature you control leaves the battlefield, "; private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { diff --git a/Mage.Sets/src/mage/cards/v/VerdantCrescendo.java b/Mage.Sets/src/mage/cards/v/VerdantCrescendo.java index 868a1eebd2e..6f4ae19b5d6 100644 --- a/Mage.Sets/src/mage/cards/v/VerdantCrescendo.java +++ b/Mage.Sets/src/mage/cards/v/VerdantCrescendo.java @@ -19,7 +19,7 @@ import java.util.UUID; */ public final class VerdantCrescendo extends CardImpl { - private final static FilterCard filter = new FilterCard("Nissa, Nature's Artisan"); + private static final FilterCard filter = new FilterCard("Nissa, Nature's Artisan"); static { filter.add(new NamePredicate("Nissa, Nature's Artisan")); diff --git a/Mage.Sets/src/mage/cards/v/VeteranBrawlers.java b/Mage.Sets/src/mage/cards/v/VeteranBrawlers.java index bbc3d1eb1f0..5d25ed9625a 100644 --- a/Mage.Sets/src/mage/cards/v/VeteranBrawlers.java +++ b/Mage.Sets/src/mage/cards/v/VeteranBrawlers.java @@ -31,7 +31,7 @@ public final class VeteranBrawlers extends CardImpl { filter.add(Predicates.not(TappedPredicate.instance)); } - final static private String rule = "{this} can't block if you control an untapped land"; + static final private String rule = "{this} can't block if you control an untapped land"; public VeteranBrawlers(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}"); diff --git a/Mage.Sets/src/mage/cards/v/VigilantMartyr.java b/Mage.Sets/src/mage/cards/v/VigilantMartyr.java index e2c4475a47d..91c80f9f9af 100644 --- a/Mage.Sets/src/mage/cards/v/VigilantMartyr.java +++ b/Mage.Sets/src/mage/cards/v/VigilantMartyr.java @@ -28,7 +28,7 @@ import java.util.UUID; */ public final class VigilantMartyr extends CardImpl { - private final static FilterSpell filter = new FilterSpell("spell that targets an enchantment"); + private static final FilterSpell filter = new FilterSpell("spell that targets an enchantment"); static { filter.add(new TargetsPermanentPredicate(StaticFilters.FILTER_ENCHANTMENT_PERMANENT)); diff --git a/Mage.Sets/src/mage/cards/v/VileAggregate.java b/Mage.Sets/src/mage/cards/v/VileAggregate.java index e9bfb82417e..a8313c09f94 100644 --- a/Mage.Sets/src/mage/cards/v/VileAggregate.java +++ b/Mage.Sets/src/mage/cards/v/VileAggregate.java @@ -25,7 +25,7 @@ import mage.filter.predicate.mageobject.ColorlessPredicate; */ public final class VileAggregate extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("colorless creatures you control"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("colorless creatures you control"); static { filter.add(ColorlessPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/v/VisageOfBolas.java b/Mage.Sets/src/mage/cards/v/VisageOfBolas.java index 965540ce1e6..cb15e7252ca 100644 --- a/Mage.Sets/src/mage/cards/v/VisageOfBolas.java +++ b/Mage.Sets/src/mage/cards/v/VisageOfBolas.java @@ -19,7 +19,7 @@ import mage.filter.predicate.mageobject.NamePredicate; */ public final class VisageOfBolas extends CardImpl { - private final static FilterCard filter = new FilterCard("Nicol Bolas, the Deceiver"); + private static final FilterCard filter = new FilterCard("Nicol Bolas, the Deceiver"); static { filter.add(new NamePredicate("Nicol Bolas, the Deceiver")); diff --git a/Mage.Sets/src/mage/cards/v/VorelOfTheHullClade.java b/Mage.Sets/src/mage/cards/v/VorelOfTheHullClade.java index 20c2459b9a2..01dbf3b1bfa 100644 --- a/Mage.Sets/src/mage/cards/v/VorelOfTheHullClade.java +++ b/Mage.Sets/src/mage/cards/v/VorelOfTheHullClade.java @@ -29,7 +29,7 @@ import mage.target.TargetPermanent; */ public final class VorelOfTheHullClade extends CardImpl { - final static private FilterPermanent filter = new FilterPermanent("artifact, creature, or land"); + static final private FilterPermanent filter = new FilterPermanent("artifact, creature, or land"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/cards/v/VraskasScorn.java b/Mage.Sets/src/mage/cards/v/VraskasScorn.java index 1b8b2575372..96871bf15bc 100644 --- a/Mage.Sets/src/mage/cards/v/VraskasScorn.java +++ b/Mage.Sets/src/mage/cards/v/VraskasScorn.java @@ -17,7 +17,7 @@ import mage.target.common.TargetOpponent; */ public final class VraskasScorn extends CardImpl { - private final static FilterCard filter = new FilterCard("Vraska, Scheming Gorgon"); + private static final FilterCard filter = new FilterCard("Vraska, Scheming Gorgon"); static { filter.add(new NamePredicate(filter.getMessage())); diff --git a/Mage.Sets/src/mage/cards/v/VraskasStoneglare.java b/Mage.Sets/src/mage/cards/v/VraskasStoneglare.java index 853236eb458..7c849798bc0 100644 --- a/Mage.Sets/src/mage/cards/v/VraskasStoneglare.java +++ b/Mage.Sets/src/mage/cards/v/VraskasStoneglare.java @@ -21,7 +21,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class VraskasStoneglare extends CardImpl { - private final static FilterCard filter = new FilterCard("Vraska, Regal Gorgon"); + private static final FilterCard filter = new FilterCard("Vraska, Regal Gorgon"); static { filter.add(new NamePredicate("Vraska, Regal Gorgon")); diff --git a/Mage.Sets/src/mage/cards/w/WalkThePlank.java b/Mage.Sets/src/mage/cards/w/WalkThePlank.java index 3981e5f1981..e4a61b8b6c2 100644 --- a/Mage.Sets/src/mage/cards/w/WalkThePlank.java +++ b/Mage.Sets/src/mage/cards/w/WalkThePlank.java @@ -19,7 +19,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class WalkThePlank extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Merfolk creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Merfolk creature"); static { filter.add(new CardTypePredicate(CardType.CREATURE)); diff --git a/Mage.Sets/src/mage/cards/w/WarsToll.java b/Mage.Sets/src/mage/cards/w/WarsToll.java index 3f103a26978..5bff2466a07 100644 --- a/Mage.Sets/src/mage/cards/w/WarsToll.java +++ b/Mage.Sets/src/mage/cards/w/WarsToll.java @@ -25,8 +25,8 @@ import mage.players.Player; */ public final class WarsToll extends CardImpl { - private final static FilterCreaturePermanent filterOpponentCreature = new FilterCreaturePermanent("creature an opponent controls"); - private final static FilterLandPermanent filterOpponentLand = new FilterLandPermanent("an opponent taps a land"); + private static final FilterCreaturePermanent filterOpponentCreature = new FilterCreaturePermanent("creature an opponent controls"); + private static final FilterLandPermanent filterOpponentLand = new FilterLandPermanent("an opponent taps a land"); static { filterOpponentCreature.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/w/WatcherOfTheRoost.java b/Mage.Sets/src/mage/cards/w/WatcherOfTheRoost.java index e0a7d80cc2f..8f7cc44265b 100644 --- a/Mage.Sets/src/mage/cards/w/WatcherOfTheRoost.java +++ b/Mage.Sets/src/mage/cards/w/WatcherOfTheRoost.java @@ -24,7 +24,7 @@ import mage.target.common.TargetCardInHand; */ public final class WatcherOfTheRoost extends CardImpl { - private final static FilterCard filter = new FilterCard("a white card in your hand"); + private static final FilterCard filter = new FilterCard("a white card in your hand"); static { filter.add(new ColorPredicate(ObjectColor.WHITE)); } diff --git a/Mage.Sets/src/mage/cards/w/WaxingMoon.java b/Mage.Sets/src/mage/cards/w/WaxingMoon.java index 7663d5fc9e3..f23908c3bf0 100644 --- a/Mage.Sets/src/mage/cards/w/WaxingMoon.java +++ b/Mage.Sets/src/mage/cards/w/WaxingMoon.java @@ -24,7 +24,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class WaxingMoon extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Werewolf you control"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Werewolf you control"); static { filter.add(new SubtypePredicate(SubType.WEREWOLF)); diff --git a/Mage.Sets/src/mage/cards/w/WeaverOfLightning.java b/Mage.Sets/src/mage/cards/w/WeaverOfLightning.java index 8c5701f97bf..818e4038535 100644 --- a/Mage.Sets/src/mage/cards/w/WeaverOfLightning.java +++ b/Mage.Sets/src/mage/cards/w/WeaverOfLightning.java @@ -23,7 +23,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class WeaverOfLightning extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/w/WildInstincts.java b/Mage.Sets/src/mage/cards/w/WildInstincts.java index cf6c797b696..7f9d7272482 100644 --- a/Mage.Sets/src/mage/cards/w/WildInstincts.java +++ b/Mage.Sets/src/mage/cards/w/WildInstincts.java @@ -21,7 +21,7 @@ import mage.target.common.TargetCreaturePermanent; */ public final class WildInstincts extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/w/WildPair.java b/Mage.Sets/src/mage/cards/w/WildPair.java index 76c38c96793..b832633bcc0 100644 --- a/Mage.Sets/src/mage/cards/w/WildPair.java +++ b/Mage.Sets/src/mage/cards/w/WildPair.java @@ -29,7 +29,7 @@ import mage.watchers.common.CastFromHandWatcher; */ public final class WildPair extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature"); static { filter.add(new OwnerPredicate(TargetController.YOU)); diff --git a/Mage.Sets/src/mage/cards/w/WortTheRaidmother.java b/Mage.Sets/src/mage/cards/w/WortTheRaidmother.java index 6fae1461700..9e7608a8e11 100644 --- a/Mage.Sets/src/mage/cards/w/WortTheRaidmother.java +++ b/Mage.Sets/src/mage/cards/w/WortTheRaidmother.java @@ -54,7 +54,7 @@ public final class WortTheRaidmother extends CardImpl { class WortGainConspireEffect extends ContinuousEffectImpl { - private final static FilterInstantOrSorcerySpell filter = new FilterInstantOrSorcerySpell(); + private static final FilterInstantOrSorcerySpell filter = new FilterInstantOrSorcerySpell(); static { filter.add(Predicates.or(new ColorPredicate(ObjectColor.RED), new ColorPredicate(ObjectColor.GREEN))); diff --git a/Mage.Sets/src/mage/cards/z/ZulaportEnforcer.java b/Mage.Sets/src/mage/cards/z/ZulaportEnforcer.java index ff5d97542b9..4ee33360d7d 100644 --- a/Mage.Sets/src/mage/cards/z/ZulaportEnforcer.java +++ b/Mage.Sets/src/mage/cards/z/ZulaportEnforcer.java @@ -27,7 +27,7 @@ import mage.filter.predicate.mageobject.ColorPredicate; */ public final class ZulaportEnforcer extends LevelerCard { - private final static FilterCreaturePermanent notBlackCreatures = new FilterCreaturePermanent("except by black creatures"); + private static final FilterCreaturePermanent notBlackCreatures = new FilterCreaturePermanent("except by black creatures"); static { notBlackCreatures.add(Predicates.not(new ColorPredicate(ObjectColor.BLACK))); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/OfferingTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/OfferingTest.java index a909755a9d9..37c9d12e65c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/OfferingTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/OfferingTest.java @@ -7,7 +7,7 @@ import org.mage.test.serverside.base.CardTestPlayerBase; public class OfferingTest extends CardTestPlayerBase { - private final static String nezumiPatron = "Patron of the Nezumi"; + private static final String nezumiPatron = "Patron of the Nezumi"; @Test diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/PlayGameTest.java b/Mage.Tests/src/test/java/org/mage/test/serverside/PlayGameTest.java index eba6b674384..a2c8e5f1b23 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/PlayGameTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/PlayGameTest.java @@ -29,7 +29,7 @@ import java.util.Locale; */ public class PlayGameTest extends MageTestBase { - private final static List colorChoices = new ArrayList<>(Arrays.asList("bu", "bg", "br", "bw", "ug", "ur", "uw", "gr", "gw", "rw", "bur", "buw", "bug", "brg", "brw", "bgw", "wur", "wug", "wrg", "rgu")); + private static final List colorChoices = new ArrayList<>(Arrays.asList("bu", "bg", "br", "bw", "ug", "ur", "uw", "gr", "gw", "rw", "bur", "buw", "bug", "brg", "brw", "bgw", "wur", "wug", "wrg", "rgu")); @Ignore @Test diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/TestPlayRandomGame.java b/Mage.Tests/src/test/java/org/mage/test/serverside/TestPlayRandomGame.java index c36b59a1081..644c9fed18e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/TestPlayRandomGame.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/TestPlayRandomGame.java @@ -28,7 +28,7 @@ import java.util.Locale; */ public class TestPlayRandomGame extends MageTestBase { - private final static List colorChoices = new ArrayList<>(Arrays.asList("bu", "bg", "br", "bw", "ug", "ur", "uw", "gr", "gw", "rw", "bur", "buw", "bug", "brg", "brw", "bgw", "wur", "wug", "wrg", "rgu")); + private static final List colorChoices = new ArrayList<>(Arrays.asList("bu", "bg", "br", "bw", "ug", "ur", "uw", "gr", "gw", "rw", "bur", "buw", "bug", "brg", "brw", "bgw", "wur", "wug", "wrg", "rgu")); @Test @Ignore diff --git a/Mage/src/main/java/mage/abilities/common/FetchLandActivatedAbility.java b/Mage/src/main/java/mage/abilities/common/FetchLandActivatedAbility.java index 40a620f5e82..fa71efebee9 100644 --- a/Mage/src/main/java/mage/abilities/common/FetchLandActivatedAbility.java +++ b/Mage/src/main/java/mage/abilities/common/FetchLandActivatedAbility.java @@ -22,6 +22,7 @@ import mage.target.common.TargetCardInLibrary; import java.util.ArrayList; import java.util.List; import java.util.Set; +import java.util.stream.Collectors; /** * @@ -51,16 +52,12 @@ public class FetchLandActivatedAbility extends ActivatedAbilityImpl { addEffect(new SearchLibraryPutInPlayEffect(target, false, true, Outcome.PutLandInPlay)); } - public FetchLandActivatedAbility(FetchLandActivatedAbility ability) { + private FetchLandActivatedAbility(FetchLandActivatedAbility ability) { super(ability); } private String subTypeNames(Set subTypes) { - StringBuilder sb = new StringBuilder(); - for (SubType subType: subTypes) { - sb.append(subType.getDescription()).append(" or "); - } - return sb.substring(0, sb.length() - 4); + return subTypes.stream().map(SubType::getDescription).collect(Collectors.joining(" or ")); } @Override diff --git a/Mage/src/main/java/mage/abilities/common/LeavesBattlefieldAllTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/LeavesBattlefieldAllTriggeredAbility.java index 8757d62401a..7ce2028a917 100644 --- a/Mage/src/main/java/mage/abilities/common/LeavesBattlefieldAllTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/LeavesBattlefieldAllTriggeredAbility.java @@ -40,7 +40,7 @@ public class LeavesBattlefieldAllTriggeredAbility extends TriggeredAbilityImpl { this.setTargetPointer = setTargetPointer; } - public LeavesBattlefieldAllTriggeredAbility(final LeavesBattlefieldAllTriggeredAbility ability) { + private LeavesBattlefieldAllTriggeredAbility(final LeavesBattlefieldAllTriggeredAbility ability) { super(ability); filter = ability.filter; setTargetPointer = ability.setTargetPointer; diff --git a/Mage/src/main/java/mage/abilities/costs/mana/ManaSymbols.java b/Mage/src/main/java/mage/abilities/costs/mana/ManaSymbols.java index 42dde43669e..877d21c55bd 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/ManaSymbols.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/ManaSymbols.java @@ -17,7 +17,7 @@ import java.util.Map; */ public class ManaSymbols extends ArrayList { - private final static Map coloredManaMap = new EnumMap(ColoredManaSymbol.class) {{ + private static final Map coloredManaMap = new EnumMap(ColoredManaSymbol.class) {{ put(ColoredManaSymbol.W, ManaSymbol.W); put(ColoredManaSymbol.U, ManaSymbol.U); put(ColoredManaSymbol.B, ManaSymbol.B); @@ -29,7 +29,7 @@ public class ManaSymbols extends ArrayList { * Contains all possible hybrid mana costs (each represents different hybrid mana symbol) * We'll use it for converting from hybrid mana cost to hybrid mana symbol. */ - private final static Map hybridManaMap = new EnumMap(ManaSymbol.class) {{ + private static final Map hybridManaMap = new EnumMap(ManaSymbol.class) {{ /** * Build map of all possible hybrid mana symbols assigning corresponding instance of hybrid mana cost. diff --git a/Mage/src/main/java/mage/abilities/keyword/AdaptAbility.java b/Mage/src/main/java/mage/abilities/keyword/AdaptAbility.java index 634c38bd4df..65d037d8c15 100644 --- a/Mage/src/main/java/mage/abilities/keyword/AdaptAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/AdaptAbility.java @@ -16,7 +16,7 @@ public class AdaptAbility extends ActivatedAbilityImpl { super(Zone.BATTLEFIELD, new AdaptEffect(adaptNumber), new ManaCostsImpl(manaCost)); } - public AdaptAbility(final AdaptAbility ability) { + private AdaptAbility(final AdaptAbility ability) { super(ability); } diff --git a/Mage/src/main/java/mage/abilities/keyword/CascadeAbility.java b/Mage/src/main/java/mage/abilities/keyword/CascadeAbility.java index b803f8e7c4a..3f44a43db90 100644 --- a/Mage/src/main/java/mage/abilities/keyword/CascadeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/CascadeAbility.java @@ -20,7 +20,7 @@ import mage.players.Player; public class CascadeAbility extends TriggeredAbilityImpl { //20091005 - 702.82 - private final static String REMINDERTEXT = " (When you cast this spell, exile cards from the top of your library until you exile a nonland card that costs less." + private static final String REMINDERTEXT = " (When you cast this spell, exile cards from the top of your library until you exile a nonland card that costs less." + " You may cast it without paying its mana cost. Put the exiled cards on the bottom in a random order.)"; private boolean withReminder; diff --git a/Mage/src/main/java/mage/abilities/keyword/HauntAbility.java b/Mage/src/main/java/mage/abilities/keyword/HauntAbility.java index 9e08681fb94..71297bc8930 100644 --- a/Mage/src/main/java/mage/abilities/keyword/HauntAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/HauntAbility.java @@ -110,8 +110,8 @@ public class HauntAbility extends TriggeredAbilityImpl { class HauntExileAbility extends ZoneChangeTriggeredAbility { - private final static String RULE_TEXT_CREATURE = "Haunt (When this creature dies, exile it haunting target creature.)"; - private final static String RULE_TEXT_SPELL = "Haunt (When this spell card is put into a graveyard after resolving, exile it haunting target creature.)"; + private static final String RULE_TEXT_CREATURE = "Haunt (When this creature dies, exile it haunting target creature.)"; + private static final String RULE_TEXT_SPELL = "Haunt (When this spell card is put into a graveyard after resolving, exile it haunting target creature.)"; private boolean creatureHaunt; diff --git a/Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java b/Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java index e2b3cba0b4e..db7dc45be6e 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java @@ -168,7 +168,7 @@ class SoulboundEntersSelfEffect extends OneShotEffect { */ class SoulbondEntersOtherAbility extends EntersBattlefieldAllTriggeredAbility { - private final static FilterCreaturePermanent soulbondFilter = new FilterCreaturePermanent(); + private static final FilterCreaturePermanent soulbondFilter = new FilterCreaturePermanent(); static { soulbondFilter.add(Predicates.not(new PairedPredicate())); diff --git a/Mage/src/main/java/mage/abilities/keyword/SunburstAbility.java b/Mage/src/main/java/mage/abilities/keyword/SunburstAbility.java index 434b57f96a2..aa03cf95792 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SunburstAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SunburstAbility.java @@ -22,8 +22,8 @@ import mage.players.Player; */ public class SunburstAbility extends EntersBattlefieldAbility { - private final static String ruleCreature = "Sunburst (This enters the battlefield with a +1/+1 counter on it for each color of mana spent to cast it.)"; - private final static String ruleNonCreature = "Sunburst (This enters the battlefield with a charge counter on it for each color of mana spent to cast it.)"; + private static final String ruleCreature = "Sunburst (This enters the battlefield with a +1/+1 counter on it for each color of mana spent to cast it.)"; + private static final String ruleNonCreature = "Sunburst (This enters the battlefield with a charge counter on it for each color of mana spent to cast it.)"; private boolean isCreature; public SunburstAbility(Card card) { diff --git a/Mage/src/main/java/mage/cards/ExpansionSet.java b/Mage/src/main/java/mage/cards/ExpansionSet.java index bc0bdc90593..688538ae18c 100644 --- a/Mage/src/main/java/mage/cards/ExpansionSet.java +++ b/Mage/src/main/java/mage/cards/ExpansionSet.java @@ -23,8 +23,8 @@ import java.util.stream.Collectors; public abstract class ExpansionSet implements Serializable { private static final Logger logger = Logger.getLogger(ExpansionSet.class); - public final static CardGraphicInfo NON_FULL_USE_VARIOUS = new CardGraphicInfo(null, true); - public final static CardGraphicInfo FULL_ART_BFZ_VARIOUS = new CardGraphicInfo(FrameStyle.BFZ_FULL_ART_BASIC, true); + public static final CardGraphicInfo NON_FULL_USE_VARIOUS = new CardGraphicInfo(null, true); + public static final CardGraphicInfo FULL_ART_BFZ_VARIOUS = new CardGraphicInfo(FrameStyle.BFZ_FULL_ART_BASIC, true); public class SetCardInfo implements Serializable { diff --git a/Mage/src/main/java/mage/game/command/planes/FieldsOfSummerPlane.java b/Mage/src/main/java/mage/game/command/planes/FieldsOfSummerPlane.java index b767e9281b9..f8444d6fc8a 100644 --- a/Mage/src/main/java/mage/game/command/planes/FieldsOfSummerPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/FieldsOfSummerPlane.java @@ -32,7 +32,7 @@ import mage.watchers.common.PlanarRollWatcher; */ public class FieldsOfSummerPlane extends Plane { - private final static FilterSpell filter = new FilterSpell("a spell"); + private static final FilterSpell filter = new FilterSpell("a spell"); public FieldsOfSummerPlane() { this.setName("Plane - Fields of Summer"); diff --git a/Mage/src/main/java/mage/game/permanent/token/AngelToken.java b/Mage/src/main/java/mage/game/permanent/token/AngelToken.java index 04f1ee9fbc3..960758bc3d5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AngelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AngelToken.java @@ -10,7 +10,7 @@ import mage.constants.SubType; public final class AngelToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("AVR", "C14", "CFX", "GTC", "ISD", "M14", "ORI", "SOI", "ZEN", "C15", "MM3")); diff --git a/Mage/src/main/java/mage/game/permanent/token/BatToken.java b/Mage/src/main/java/mage/game/permanent/token/BatToken.java index d87677d013b..6e22ffb8ce4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BatToken.java @@ -10,7 +10,7 @@ import mage.constants.SubType; public final class BatToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("MMA", "C17")); diff --git a/Mage/src/main/java/mage/game/permanent/token/BeastToken.java b/Mage/src/main/java/mage/game/permanent/token/BeastToken.java index 3ab4664bb5b..ed845d62cce 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken.java @@ -14,7 +14,7 @@ import mage.constants.SubType; */ public final class BeastToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("C14", "LRW", "M15", "M14", "DDL", "M13", "M12", "DD3GVL", "NPH", "M11", "M10", "EVE", "MM3", "CMA", "E01")); diff --git a/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java b/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java index d65062a55e7..a65f361af96 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java @@ -14,7 +14,7 @@ import mage.constants.SubType; */ public final class BeastToken2 extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("ZEN", "C14", "DDD", "C15", "DD3GVL", "MM3", "CMA", "E01")); diff --git a/Mage/src/main/java/mage/game/permanent/token/BelzenlokClericToken.java b/Mage/src/main/java/mage/game/permanent/token/BelzenlokClericToken.java index 378dbfc769a..10da78ae2da 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BelzenlokClericToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BelzenlokClericToken.java @@ -14,7 +14,7 @@ import mage.constants.SubType; */ public final class BelzenlokClericToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("DOM")); } diff --git a/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java b/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java index 4f1f815b654..214b4f07d62 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java @@ -29,7 +29,7 @@ import mage.players.Player; */ public final class BelzenlokDemonToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("DOM")); } diff --git a/Mage/src/main/java/mage/game/permanent/token/BrudicladTelchorMyrToken.java b/Mage/src/main/java/mage/game/permanent/token/BrudicladTelchorMyrToken.java index 33de29d06fa..5ac97bf621f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BrudicladTelchorMyrToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BrudicladTelchorMyrToken.java @@ -10,7 +10,7 @@ import mage.constants.SubType; public final class BrudicladTelchorMyrToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("C18")); diff --git a/Mage/src/main/java/mage/game/permanent/token/CatToken.java b/Mage/src/main/java/mage/game/permanent/token/CatToken.java index 36dd3f26607..bfc82b39696 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatToken.java @@ -15,7 +15,7 @@ import mage.constants.SubType; */ public final class CatToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("SOM", "M13", "M14", "C14", "C15", "C17")); diff --git a/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java index f6b6dff1eae..63b4f4c6dd6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java @@ -14,7 +14,7 @@ import mage.constants.SubType; */ public final class CatWarriorToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("PLC", "C17")); diff --git a/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java b/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java index 593a757c1cb..30c1e3baa1b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java @@ -14,7 +14,7 @@ import java.util.List; */ public final class CentaurToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("RTR", "MM3", "RNA")); diff --git a/Mage/src/main/java/mage/game/permanent/token/ChainersTormentNightmareToken.java b/Mage/src/main/java/mage/game/permanent/token/ChainersTormentNightmareToken.java index b7e87b15506..ad357005716 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ChainersTormentNightmareToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ChainersTormentNightmareToken.java @@ -14,7 +14,7 @@ import mage.MageInt; */ public final class ChainersTormentNightmareToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("DOM")); } diff --git a/Mage/src/main/java/mage/game/permanent/token/ClueArtifactToken.java b/Mage/src/main/java/mage/game/permanent/token/ClueArtifactToken.java index c6d7aa94a42..c9948238f5e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ClueArtifactToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ClueArtifactToken.java @@ -20,7 +20,7 @@ import java.util.List; */ public final class ClueArtifactToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("SOI", "EDM")); diff --git a/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java b/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java index 1bd425c21cd..edbd8a30761 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java @@ -15,7 +15,7 @@ import mage.constants.SubType; */ public final class DeathtouchRatToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("C17")); } diff --git a/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java b/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java index 7cec19c0917..1fdaffe7b72 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java @@ -19,7 +19,7 @@ import mage.filter.common.FilterControlledPermanent; */ public final class DokaiWeaverofLifeToken extends TokenImpl { - final static FilterControlledPermanent filterLands = new FilterControlledLandPermanent("lands you control"); + static final FilterControlledPermanent filterLands = new FilterControlledLandPermanent("lands you control"); public DokaiWeaverofLifeToken() { super("Elemental", "X/X green Elemental creature token, where X is the number of lands you control"); diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonToken.java b/Mage/src/main/java/mage/game/permanent/token/DragonToken.java index c190d3bdfb6..0d441de1caa 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonToken.java @@ -16,7 +16,7 @@ import mage.constants.SubType; */ public final class DragonToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("DTK", "MMA", "ALA", "MM3", "C17")); diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java b/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java index 77f5516b953..a5436d7f7c0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java @@ -15,7 +15,7 @@ import mage.constants.SubType; */ public final class DragonToken2 extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("WWK", "10E", "BFZ", "C15", "CN2", "CMA")); diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonTokenGold.java b/Mage/src/main/java/mage/game/permanent/token/DragonTokenGold.java index ca4518c18bd..13d468195d3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonTokenGold.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonTokenGold.java @@ -16,7 +16,7 @@ import mage.constants.SubType; */ public final class DragonTokenGold extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("UST","H17")); diff --git a/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java b/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java index 093abb05617..467f16a0b35 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java @@ -14,7 +14,7 @@ import mage.MageInt; */ public final class EdgarMarkovToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("C17")); } diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziHorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziHorrorToken.java index e6c531d8ed4..95f042f15be 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EldraziHorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EldraziHorrorToken.java @@ -14,7 +14,7 @@ import mage.constants.SubType; */ public final class EldraziHorrorToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Collections.singletonList("EMN")); diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java index d6c551d4c28..7b5c526790f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java @@ -20,7 +20,7 @@ import mage.util.RandomUtil; */ public final class EldraziScionToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("BFZ", "OGW")); diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java index e6ebe54a1cb..dbbc9dcbdad 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java @@ -20,7 +20,7 @@ import mage.util.RandomUtil; */ public final class EldraziSpawnToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("ROE", "MM2", "DDP", "C17")); diff --git a/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java b/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java index 8622dd3dab4..88637b7b67d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java @@ -15,7 +15,7 @@ import mage.constants.SubType; */ public final class ElementalShamanToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("C15", "DD3JVC", "DD2", "LRW")); diff --git a/Mage/src/main/java/mage/game/permanent/token/ElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/ElementalToken.java index 0befcb97ec4..5369b5bff61 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElementalToken.java @@ -16,7 +16,7 @@ import mage.constants.SubType; */ public final class ElementalToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("OGW", "CON", "DIS")); diff --git a/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java b/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java index ef74c81e010..3bdeb7a0951 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java @@ -15,7 +15,7 @@ import mage.constants.SubType; */ public final class ElephantToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("C14", "CNS", "DDD", "MM2", "WWK", "OGW", "C15", "DD3GVL", "MM3", "CMA")); diff --git a/Mage/src/main/java/mage/game/permanent/token/ElfToken.java b/Mage/src/main/java/mage/game/permanent/token/ElfToken.java index e9957297309..baad518b72d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElfToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElfToken.java @@ -14,7 +14,7 @@ import mage.constants.SubType; */ public final class ElfToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("C14", "SHM", "EVG", "LRW", "ORI")); diff --git a/Mage/src/main/java/mage/game/permanent/token/FaerieRogueToken.java b/Mage/src/main/java/mage/game/permanent/token/FaerieRogueToken.java index 974355b47fc..a5b324e663e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FaerieRogueToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FaerieRogueToken.java @@ -17,7 +17,7 @@ import mage.abilities.keyword.FlyingAbility; */ public final class FaerieRogueToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("SHM", "MOR", "MMA", "MM2")); diff --git a/Mage/src/main/java/mage/game/permanent/token/FreyaliseLlanowarsFuryToken.java b/Mage/src/main/java/mage/game/permanent/token/FreyaliseLlanowarsFuryToken.java index 4bf277ec07e..2f2c3b25ed6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FreyaliseLlanowarsFuryToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FreyaliseLlanowarsFuryToken.java @@ -16,7 +16,7 @@ import mage.abilities.mana.GreenManaAbility; */ public final class FreyaliseLlanowarsFuryToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("C14", "CMA")); diff --git a/Mage/src/main/java/mage/game/permanent/token/GermToken.java b/Mage/src/main/java/mage/game/permanent/token/GermToken.java index aa122e30486..7b8ed218af0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GermToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GermToken.java @@ -13,7 +13,7 @@ import mage.constants.SubType; */ public final class GermToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("NPH", "MBS", "SOM", "EMA", "C16")); diff --git a/Mage/src/main/java/mage/game/permanent/token/GoatToken.java b/Mage/src/main/java/mage/game/permanent/token/GoatToken.java index 7c923be38ab..d2d509018cb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoatToken.java @@ -15,7 +15,7 @@ import mage.constants.SubType; */ public final class GoatToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("EVE", "M13", "M14", "C14")); diff --git a/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java index 19a6571f9d4..70b12ee68ec 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java @@ -14,7 +14,7 @@ import java.util.List; */ public final class GoblinToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("10E", "ALA", "SOM", "M10", "NPH", "M13", "RTR", diff --git a/Mage/src/main/java/mage/game/permanent/token/GoldToken.java b/Mage/src/main/java/mage/game/permanent/token/GoldToken.java index 87db9f0acc4..65f263911bc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoldToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoldToken.java @@ -17,7 +17,7 @@ import mage.constants.Zone; */ public final class GoldToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("BNG", "C17")); } diff --git a/Mage/src/main/java/mage/game/permanent/token/GolemToken.java b/Mage/src/main/java/mage/game/permanent/token/GolemToken.java index 46945073d01..7f51a49c45b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GolemToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GolemToken.java @@ -15,7 +15,7 @@ import mage.MageInt; */ public final class GolemToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("MM2", "NPH", "SOM", "MM3")); diff --git a/Mage/src/main/java/mage/game/permanent/token/HuntedCentaurToken.java b/Mage/src/main/java/mage/game/permanent/token/HuntedCentaurToken.java index 66fdb89a163..63fbd6c7930 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HuntedCentaurToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HuntedCentaurToken.java @@ -16,7 +16,7 @@ import mage.abilities.keyword.ProtectionAbility; */ public final class HuntedCentaurToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("RTR", "MM3")); diff --git a/Mage/src/main/java/mage/game/permanent/token/HuntedDragonKnightToken.java b/Mage/src/main/java/mage/game/permanent/token/HuntedDragonKnightToken.java index ccc227663eb..f0751efe801 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HuntedDragonKnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HuntedDragonKnightToken.java @@ -14,7 +14,7 @@ import mage.constants.SubType; */ public final class HuntedDragonKnightToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("ORI", "RTR", "C15")); diff --git a/Mage/src/main/java/mage/game/permanent/token/InsectToken.java b/Mage/src/main/java/mage/game/permanent/token/InsectToken.java index 24ccf81e3c0..8b2fa6e4bf0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/InsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/InsectToken.java @@ -15,7 +15,7 @@ import mage.constants.SubType; */ public final class InsectToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("M10", "MM2", "SOI")); diff --git a/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java index 39eae8e0d30..aa9ca684981 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java @@ -18,7 +18,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public final class KalonianTwingroveTreefolkWarriorToken extends TokenImpl { - final static FilterControlledPermanent filterLands = new FilterControlledPermanent("Forests you control"); + static final FilterControlledPermanent filterLands = new FilterControlledPermanent("Forests you control"); static { filterLands.add(new SubtypePredicate(SubType.FOREST)); diff --git a/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java b/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java index 7c558f7c31d..faa2d6a54b0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java @@ -29,7 +29,7 @@ public final class KarnConstructToken extends TokenImpl { filter.add(new CardTypePredicate(CardType.ARTIFACT)); } - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("DOM")); } diff --git a/Mage/src/main/java/mage/game/permanent/token/KaroxBladewingDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/KaroxBladewingDragonToken.java index 5f1946ff769..cb6a9896847 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KaroxBladewingDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KaroxBladewingDragonToken.java @@ -15,7 +15,7 @@ import mage.constants.SuperType; */ public final class KaroxBladewingDragonToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("DOM")); } diff --git a/Mage/src/main/java/mage/game/permanent/token/KnightToken.java b/Mage/src/main/java/mage/game/permanent/token/KnightToken.java index 3006cb62d63..e69e3735b07 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KnightToken.java @@ -15,7 +15,7 @@ import mage.util.RandomUtil; */ public final class KnightToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("ORI", "RTR", "C15", "CMA", "DOM")); diff --git a/Mage/src/main/java/mage/game/permanent/token/LeafdrakeRoostDrakeToken.java b/Mage/src/main/java/mage/game/permanent/token/LeafdrakeRoostDrakeToken.java index d62053a100c..69cc8040abc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/LeafdrakeRoostDrakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/LeafdrakeRoostDrakeToken.java @@ -15,7 +15,7 @@ import mage.abilities.keyword.FlyingAbility; */ public final class LeafdrakeRoostDrakeToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("C13", "CMA")); diff --git a/Mage/src/main/java/mage/game/permanent/token/MyrToken.java b/Mage/src/main/java/mage/game/permanent/token/MyrToken.java index f3df80a3d71..9077c7f15c8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MyrToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MyrToken.java @@ -10,7 +10,7 @@ import mage.constants.SubType; public final class MyrToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("C14", "MM2", "NPH", "SOM")); diff --git a/Mage/src/main/java/mage/game/permanent/token/OviyaPashiriSageLifecrafterToken.java b/Mage/src/main/java/mage/game/permanent/token/OviyaPashiriSageLifecrafterToken.java index ca21913063d..383605fd5c5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OviyaPashiriSageLifecrafterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OviyaPashiriSageLifecrafterToken.java @@ -13,7 +13,7 @@ import mage.util.RandomUtil; */ public final class OviyaPashiriSageLifecrafterToken extends TokenImpl { - final static FilterControlledCreaturePermanent filterCreature = new FilterControlledCreaturePermanent("creatures you control"); + static final FilterControlledCreaturePermanent filterCreature = new FilterControlledCreaturePermanent("creatures you control"); public OviyaPashiriSageLifecrafterToken() { this(1); diff --git a/Mage/src/main/java/mage/game/permanent/token/PlantToken.java b/Mage/src/main/java/mage/game/permanent/token/PlantToken.java index a3b6ebe09d7..962b0c657ae 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PlantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PlantToken.java @@ -11,7 +11,7 @@ import mage.constants.SubType; public final class PlantToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("WWK", "DDP", "OGW")); diff --git a/Mage/src/main/java/mage/game/permanent/token/PrismToken.java b/Mage/src/main/java/mage/game/permanent/token/PrismToken.java index fc4275add2e..8f0336ee67f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PrismToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PrismToken.java @@ -14,7 +14,7 @@ import mage.constants.SubType; */ public final class PrismToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Collections.singletonList("VIS")); diff --git a/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java b/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java index fb52d5ed7f8..a653c0ddbc2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java @@ -16,7 +16,7 @@ import mage.util.RandomUtil; */ public final class SaprolingToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList( diff --git a/Mage/src/main/java/mage/game/permanent/token/ServoToken.java b/Mage/src/main/java/mage/game/permanent/token/ServoToken.java index 2a72c0a8051..4afbc898ec6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ServoToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ServoToken.java @@ -15,7 +15,7 @@ import mage.util.RandomUtil; */ public final class ServoToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Collections.singletonList("KLD")); diff --git a/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java b/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java index 2916047a750..88ccc6b5060 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java @@ -15,7 +15,7 @@ import mage.constants.SubType; */ public final class SnakeToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("ZEN", "KTK", "MM2", "C15")); diff --git a/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java index 719e32a1f50..781374b86b9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java @@ -15,7 +15,7 @@ import mage.util.RandomUtil; */ public final class SoldierToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("10E", "M15", "C14", "ORI", "ALA", "DDF", "THS", "M12", "M13", "MM2", "MMA", "RTR", diff --git a/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java b/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java index 8c1ad0188c7..59fe7b1231c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java @@ -16,7 +16,7 @@ import mage.abilities.keyword.HasteAbility; */ public final class SoldierTokenWithHaste extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("GTC", "MM3")); diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java index 84f21504812..f1e69fe3b0d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java @@ -19,7 +19,7 @@ import mage.constants.SubType; */ public final class SpiderToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("ISD", "EMN", "C15", "SHM")); diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java index 5a1f7c4dbfd..8264a002eee 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java @@ -13,7 +13,7 @@ import mage.constants.SubType; */ public final class SpiritToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("CHK", "EMA", "C16")); diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java index b3bc59eeba4..0b46fd648c0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java @@ -14,7 +14,7 @@ import java.util.List; */ public final class SpiritWhiteToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("AVR", "C14", "CNS", "DDC", "DDK", "FRF", "ISD", "KTK", "M15", "MM2", "SHM", diff --git a/Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java b/Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java index 632b4a07424..9fbee3b13f0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java @@ -14,7 +14,7 @@ import mage.constants.SubType; */ public final class SquirrelToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Collections.singletonList("CNS")); diff --git a/Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java b/Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java index e39bc6107c3..d2a6c00ffdb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java @@ -16,7 +16,7 @@ import mage.util.RandomUtil; */ public final class ThopterColorlessToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("MBS", "ORI", "KLD")); diff --git a/Mage/src/main/java/mage/game/permanent/token/ThrullToken.java b/Mage/src/main/java/mage/game/permanent/token/ThrullToken.java index cda4a663418..a417cea7211 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ThrullToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ThrullToken.java @@ -15,7 +15,7 @@ import mage.constants.SubType; */ public final class ThrullToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Collections.singletonList("MM2")); diff --git a/Mage/src/main/java/mage/game/permanent/token/TitaniaProtectorOfArgothElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/TitaniaProtectorOfArgothElementalToken.java index f7a02d4dd3d..38bd95ccd73 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TitaniaProtectorOfArgothElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TitaniaProtectorOfArgothElementalToken.java @@ -15,7 +15,7 @@ import mage.ObjectColor; */ public final class TitaniaProtectorOfArgothElementalToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("C14", "CMA")); diff --git a/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java b/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java index 6325461b403..204dd81471f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java @@ -18,7 +18,7 @@ import java.util.List; */ public final class TreasureToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("XLN", "RNA")); diff --git a/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java index 4c4672101da..98bedc8bf69 100644 --- a/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java @@ -15,7 +15,7 @@ import mage.abilities.keyword.FlyingAbility; */ public final class UtvaraHellkiteDragonToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("C17")); } diff --git a/Mage/src/main/java/mage/game/permanent/token/ValdukElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/ValdukElementalToken.java index 6bf1df172e2..9b10f6d21dc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ValdukElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ValdukElementalToken.java @@ -16,7 +16,7 @@ import mage.abilities.keyword.TrampleAbility; */ public final class ValdukElementalToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("DOM")); } diff --git a/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java index 0856aece60b..77dc8c07af9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java @@ -15,7 +15,7 @@ import mage.abilities.keyword.FlyingAbility; */ public final class WasitoraCatDragonToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("C17")); diff --git a/Mage/src/main/java/mage/game/permanent/token/WolfToken.java b/Mage/src/main/java/mage/game/permanent/token/WolfToken.java index 90333794a14..1172fb2a32f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WolfToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WolfToken.java @@ -15,7 +15,7 @@ import mage.constants.SubType; */ public final class WolfToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("BNG", "C14", "CNS", "FNMP", "ISD", "LRW", "M10", "M14", "MM2", "SHM", "SOM", "ZEN", "SOI", "C15", "M15")); diff --git a/Mage/src/main/java/mage/game/permanent/token/WurmToken2.java b/Mage/src/main/java/mage/game/permanent/token/WurmToken2.java index 63aca026ce2..598e85a5a40 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WurmToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/WurmToken2.java @@ -16,7 +16,7 @@ import mage.abilities.keyword.TrampleAbility; */ public final class WurmToken2 extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("RTR", "MM3")); diff --git a/Mage/src/main/java/mage/game/permanent/token/WurmToken3.java b/Mage/src/main/java/mage/game/permanent/token/WurmToken3.java index f30e990cbc8..31425bb2bdb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WurmToken3.java +++ b/Mage/src/main/java/mage/game/permanent/token/WurmToken3.java @@ -15,7 +15,7 @@ import mage.MageInt; */ public final class WurmToken3 extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("AKH")); diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieKnightToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieKnightToken.java index 7869f2ae180..4927f61524c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieKnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieKnightToken.java @@ -12,7 +12,7 @@ import mage.constants.SubType; public final class ZombieKnightToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("DOM")); } diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java index 432de3e57c0..dc5d7fad460 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java @@ -14,7 +14,7 @@ import java.util.List; */ public final class ZombieToken extends TokenImpl { - final static private List tokenImageSets = new ArrayList<>(); + static final private List tokenImageSets = new ArrayList<>(); static { tokenImageSets.addAll(Arrays.asList("10E", "M10", "M11", "M12", "M13", "M14", "M15", "MBS", "ALA", "ISD", "C14", "C15", "C16", "C17", "CNS", diff --git a/Mage/src/main/java/mage/target/common/TargetPermanentOrPlayerWithCounter.java b/Mage/src/main/java/mage/target/common/TargetPermanentOrPlayerWithCounter.java index 5fb97de434a..d6a515991df 100644 --- a/Mage/src/main/java/mage/target/common/TargetPermanentOrPlayerWithCounter.java +++ b/Mage/src/main/java/mage/target/common/TargetPermanentOrPlayerWithCounter.java @@ -17,7 +17,7 @@ import mage.filter.predicate.permanent.CounterPredicate; */ public class TargetPermanentOrPlayerWithCounter extends TargetPermanentOrPlayer { - protected final FilterPermanentOrPlayerWithCounter filter; + protected final FilterPermanentOrPlayerWithCounter targetFilter; public TargetPermanentOrPlayerWithCounter() { this(1, 1); @@ -33,16 +33,16 @@ public class TargetPermanentOrPlayerWithCounter extends TargetPermanentOrPlayer public TargetPermanentOrPlayerWithCounter(int minNumTargets, int maxNumTargets, boolean notTarget) { super(minNumTargets, maxNumTargets, notTarget); - this.filter = new FilterPermanentOrPlayerWithCounter(); + this.targetFilter = new FilterPermanentOrPlayerWithCounter(); this.filterPermanent = new FilterPermanent(); this.filterPermanent.add(new CounterPredicate(null)); - this.targetName = filter.getMessage(); + this.targetName = targetFilter.getMessage(); } public TargetPermanentOrPlayerWithCounter(final TargetPermanentOrPlayerWithCounter target) { super(target); - this.filter = target.filter.copy(); - super.setFilter(this.filter); + this.targetFilter = target.targetFilter.copy(); + super.setFilter(this.targetFilter); } @Override