diff --git a/Mage.Client/src/main/java/mage/client/dialog/FeedbackDialog.java b/Mage.Client/src/main/java/mage/client/dialog/FeedbackDialog.java index 705ae902e99..2ef2af2c0da 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/FeedbackDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/FeedbackDialog.java @@ -249,7 +249,10 @@ public class FeedbackDialog extends javax.swing.JDialog { if (message.length() > 300) { JOptionPane.showMessageDialog(null, "\"Describe your idea\" value is too long (300 characters max)", "Warning", JOptionPane.INFORMATION_MESSAGE); } - String email = cleanUpType(cbFeedbackType.getSelectedItem().toString()); + String email = txtEmail.getText().trim(); + if (email.length() > 100) { + email = email.substring(0, 100); + } if (MageFrame.getSession().sendFeedback(title, type, message, email)) { JOptionPane.showMessageDialog(null, "Feedback was sent. Thank you!", "Success", JOptionPane.INFORMATION_MESSAGE); reset(); diff --git a/Mage.Server.Console/src/main/java/mage/server/console/ConnectDialog.java b/Mage.Server.Console/src/main/java/mage/server/console/ConnectDialog.java index a18518efd8c..86b8ce10982 100644 --- a/Mage.Server.Console/src/main/java/mage/server/console/ConnectDialog.java +++ b/Mage.Server.Console/src/main/java/mage/server/console/ConnectDialog.java @@ -483,7 +483,7 @@ public class ConnectDialog extends JDialog { private void findPublicServerActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed BufferedReader in = null; try { - URL serverListURL = new URL("http://mage.googlecode.com/files/server-list.txt"); + URL serverListURL = new URL("http://download.magefree.com/files/server-list.txt"); in = new BufferedReader(new InputStreamReader(serverListURL.openStream())); List servers = new ArrayList(); diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/mage-player-ai-mcts.iml b/Mage.Server.Plugins/Mage.Player.AIMCTS/mage-player-ai-mcts.iml index 9fb94dbb758..716496c9c72 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMCTS/mage-player-ai-mcts.iml +++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/mage-player-ai-mcts.iml @@ -10,9 +10,9 @@ - - - + + + diff --git a/Mage.Server/src/main/java/mage/server/util/ServerMessagesUtil.java b/Mage.Server/src/main/java/mage/server/util/ServerMessagesUtil.java index ae35608e4ea..3831c5f25be 100644 --- a/Mage.Server/src/main/java/mage/server/util/ServerMessagesUtil.java +++ b/Mage.Server/src/main/java/mage/server/util/ServerMessagesUtil.java @@ -97,10 +97,10 @@ public class ServerMessagesUtil { log.debug("Reading server messages..."); List motdMessages = readFromFile(); List newMessages = new ArrayList(); - newMessages.add(getServerStatistics()); if (motdMessages != null) { newMessages.addAll(motdMessages); } + newMessages.add(getServerStatistics()); lock.writeLock().lock(); try { diff --git a/Mage.Sets/src/mage/sets/urzassaga/Fluctuator.java b/Mage.Sets/src/mage/sets/urzassaga/Fluctuator.java deleted file mode 100644 index 62119ce32a7..00000000000 --- a/Mage.Sets/src/mage/sets/urzassaga/Fluctuator.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation are those of the - * authors and should not be interpreted as representing official policies, either expressed - * or implied, of BetaSteward_at_googlemail.com. - */ -package mage.sets.urzassaga; - -import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.keyword.CyclingAbility; -import mage.cards.CardImpl; - -/** - * - * @author North - */ -public class Fluctuator extends CardImpl { - - public Fluctuator(UUID ownerId) { - super(ownerId, 295, "Fluctuator", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{2}"); - this.expansionSetCode = "USG"; - - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); - } - - public Fluctuator(final Fluctuator card) { - super(card); - } - - @Override - public Fluctuator copy() { - return new Fluctuator(this); - } -}