From 8c4d4e29ec1cadc43ed3f9699bd8034824bd041a Mon Sep 17 00:00:00 2001 From: Skyler Sell Date: Wed, 13 Jan 2016 13:39:26 -0800 Subject: [PATCH 1/4] Add Carom. Razia, Boros Archangel - Fix bug where server log displays error when second target no longer exists (such as a token that has been destroyed). --- .../src/mage/sets/planechase/RaziaBorosArchangel.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Mage.Sets/src/mage/sets/planechase/RaziaBorosArchangel.java b/Mage.Sets/src/mage/sets/planechase/RaziaBorosArchangel.java index be5502dbe7..49aa60f7b7 100644 --- a/Mage.Sets/src/mage/sets/planechase/RaziaBorosArchangel.java +++ b/Mage.Sets/src/mage/sets/planechase/RaziaBorosArchangel.java @@ -82,7 +82,7 @@ public class RaziaBorosArchangel extends CardImpl { target.setTargetTag(1); ability.addTarget(target); - FilterCreaturePermanent filter = new FilterCreaturePermanent("creature (damage is redirected to)"); + FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature (damage is redirected to)"); filter.add(new AnotherTargetPredicate(2)); target = new TargetCreaturePermanent(filter); target.setTargetTag(2); @@ -133,9 +133,11 @@ class RaziaBorosArchangelEffect extends RedirectionEffect { @Override public boolean applies(GameEvent event, Ability source, Game game) { if (event.getTargetId().equals(getTargetPointer().getFirst(game, source))) { - if (redirectToObject.equals(new MageObjectReference(source.getTargets().get(1).getFirstTarget(), game))) { - redirectTarget = source.getTargets().get(1); - return true; + if (game.getControllerId(redirectToObject.getSourceId()) != null) { + if (redirectToObject.equals(new MageObjectReference(source.getTargets().get(1).getFirstTarget(), game))) { + redirectTarget = source.getTargets().get(1); + return true; + } } } return false; From 6eb162734bfbe1f8fc161cf5ee4ceaf65a6b5569 Mon Sep 17 00:00:00 2001 From: Skyler Sell Date: Wed, 13 Jan 2016 13:43:13 -0800 Subject: [PATCH 2/4] Add Carom --- Mage.Sets/src/mage/sets/dissension/Carom.java | 120 ++++++++++++++++++ 1 file changed, 120 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/dissension/Carom.java diff --git a/Mage.Sets/src/mage/sets/dissension/Carom.java b/Mage.Sets/src/mage/sets/dissension/Carom.java new file mode 100644 index 0000000000..97569b0e97 --- /dev/null +++ b/Mage.Sets/src/mage/sets/dissension/Carom.java @@ -0,0 +1,120 @@ +/* + * 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.dissension; + +import java.util.UUID; +import mage.MageObjectReference; +import mage.abilities.Ability; +import mage.abilities.effects.RedirectionEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.AnotherTargetPredicate; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.target.TargetSource; +import mage.target.common.TargetCreaturePermanent; + +/** + * + * @author Skyler Sell + */ +public class Carom extends CardImpl { + + public Carom(UUID ownerId) { + super(ownerId, 6, "Carom", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); + this.expansionSetCode = "DIS"; + + // The next 1 damage that would be dealt to target creature this turn is dealt to another target creature instead. + // Draw a card. + this.getSpellAbility().addEffect(new CaromEffect(Duration.EndOfTurn, 1)); + + TargetCreaturePermanent target = new TargetCreaturePermanent(); + target.setTargetTag(1); + this.getSpellAbility().addTarget(target); + + FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature (damage is redirected to)"); + filter.add(new AnotherTargetPredicate(2)); + TargetCreaturePermanent target2 = new TargetCreaturePermanent(filter); + target2.setTargetTag(2); + this.getSpellAbility().addTarget(target2); + + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + } + + public Carom(final Carom card) { + super(card); + } + + @Override + public Carom copy() { + return new Carom(this); + } +} + +class CaromEffect extends RedirectionEffect { + + protected MageObjectReference redirectToObject; + + public CaromEffect(Duration duration, int amount) { + super(duration, amount, true); + staticText = "The next " + amount + " damage that would be dealt to target creature this turn is dealt to another target creature instead"; + } + + public CaromEffect(final CaromEffect effect) { + super(effect); + } + + @Override + public CaromEffect copy() { + return new CaromEffect(this); + } + + @Override + public void init(Ability source, Game game) { + super.init(source, game); + redirectToObject = new MageObjectReference(source.getTargets().get(1).getFirstTarget(), game); + } + + @Override + public boolean applies(GameEvent event, Ability source, Game game) { + if (event.getTargetId().equals(getTargetPointer().getFirst(game, source))) { + if (game.getControllerId(redirectToObject.getSourceId()) != null) { + if (redirectToObject.equals(new MageObjectReference(source.getTargets().get(1).getFirstTarget(), game))) { + redirectTarget = source.getTargets().get(1); + return true; + } + } + } + return false; + } +} From 199e278ed9e9e42ecac1a3e5fb607490268b326a Mon Sep 17 00:00:00 2001 From: Me Car Date: Thu, 14 Jan 2016 03:59:35 +0900 Subject: [PATCH 3/4] Add input boxes to password reset form for server address and port. --- .../client/dialog/ResetPasswordDialog.form | 49 +++++++++++++-- .../client/dialog/ResetPasswordDialog.java | 60 ++++++++++++++----- 2 files changed, 89 insertions(+), 20 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/dialog/ResetPasswordDialog.form b/Mage.Client/src/main/java/mage/client/dialog/ResetPasswordDialog.form index 448116ad45..36bf18ac94 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/ResetPasswordDialog.form +++ b/Mage.Client/src/main/java/mage/client/dialog/ResetPasswordDialog.form @@ -27,12 +27,23 @@ - + - - + + + + + + + + + + + + + @@ -41,7 +52,17 @@ - + + + + + + + + + + + @@ -275,5 +296,25 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Mage.Client/src/main/java/mage/client/dialog/ResetPasswordDialog.java b/Mage.Client/src/main/java/mage/client/dialog/ResetPasswordDialog.java index 2d338884e3..1328ec2504 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/ResetPasswordDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/ResetPasswordDialog.java @@ -28,6 +28,10 @@ public class ResetPasswordDialog extends MageDialog { } public void showDialog() { + this.txtServer.setText(MageFrame.getPreferences().get("serverAddress", Config.serverName)); + this.txtPort.setText(MageFrame.getPreferences().get("serverPort", Integer.toString(Config.port))); + this.lblStatus.setText(""); + this.setModal(true); this.setLocation(50, 50); this.setVisible(true); @@ -59,6 +63,10 @@ public class ResetPasswordDialog extends MageDialog { btnGetAuthToken = new javax.swing.JButton(); lblStatus = new javax.swing.JLabel(); btnCancel = new javax.swing.JButton(); + lblServer = new javax.swing.JLabel(); + txtServer = new javax.swing.JTextField(); + txtPort = new javax.swing.JTextField(); + lblPort = new javax.swing.JLabel(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); setTitle("Reset password"); @@ -192,6 +200,12 @@ public class ResetPasswordDialog extends MageDialog { } }); + lblServer.setLabelFor(txtServer); + lblServer.setText("Server:"); + + lblPort.setLabelFor(txtPort); + lblPort.setText("Port:"); + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( @@ -199,18 +213,34 @@ public class ResetPasswordDialog extends MageDialog { .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addGap(0, 0, Short.MAX_VALUE) .addComponent(btnCancel)) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + .addGroup(layout.createSequentialGroup() .addContainerGap() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jPanel1, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(lblStatus, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jPanel2, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(lblStatus, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(lblServer) + .addComponent(lblPort)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(txtServer) + .addComponent(txtPort)))) .addContainerGap()) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() - .addGap(7, 7, 7) + .addContainerGap() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(lblServer) + .addComponent(txtServer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(txtPort, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(lblPort)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) @@ -231,12 +261,9 @@ public class ResetPasswordDialog extends MageDialog { } connection = new Connection(); - - // Use the default setting for server connection. - connection.setHost(MageFrame.getPreferences().get("serverAddress", Config.serverName)); - connection.setPort(Integer.valueOf(MageFrame.getPreferences().get("serverPort", Integer.toString(Config.port)))); + connection.setHost(this.txtServer.getText().trim()); + connection.setPort(Integer.valueOf(this.txtPort.getText().trim())); PreferencesDialog.setProxyInformation(connection); - connection.setEmail(this.txtEmail.getText().trim()); getAuthTokenTask = new GetAuthTokenTask(); @@ -262,12 +289,9 @@ public class ResetPasswordDialog extends MageDialog { } connection = new Connection(); - - // Use the default setting for server connection. - connection.setHost(MageFrame.getPreferences().get("serverAddress", Config.serverName)); - connection.setPort(Integer.valueOf(MageFrame.getPreferences().get("serverPort", Integer.toString(Config.port)))); + connection.setHost(this.txtServer.getText().trim()); + connection.setPort(Integer.valueOf(this.txtPort.getText().trim())); PreferencesDialog.setProxyInformation(connection); - connection.setEmail(this.txtEmail.getText().trim()); connection.setAuthToken(this.txtAuthToken.getText().trim()); connection.setPassword(this.txtPassword.getText().trim()); @@ -384,10 +408,14 @@ public class ResetPasswordDialog extends MageDialog { private javax.swing.JLabel lblPassword; private javax.swing.JLabel lblPasswordConfirmation; private javax.swing.JLabel lblPasswordConfirmationReasoning; + private javax.swing.JLabel lblPort; + private javax.swing.JLabel lblServer; private javax.swing.JLabel lblStatus; private javax.swing.JTextField txtAuthToken; private javax.swing.JTextField txtEmail; private javax.swing.JPasswordField txtPassword; private javax.swing.JPasswordField txtPasswordConfirmation; + private javax.swing.JTextField txtPort; + private javax.swing.JTextField txtServer; // End of variables declaration//GEN-END:variables } From 4b25e32caf4e48ad8565b6a91e7ac9662c4bf3b3 Mon Sep 17 00:00:00 2001 From: Me Car Date: Thu, 14 Jan 2016 04:09:21 +0900 Subject: [PATCH 4/4] Do not proceed to password reset flow when authentication is not enabled. --- Mage.Server/src/main/java/mage/server/MageServerImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Mage.Server/src/main/java/mage/server/MageServerImpl.java b/Mage.Server/src/main/java/mage/server/MageServerImpl.java index 1412d25d3d..3c0672bfdd 100644 --- a/Mage.Server/src/main/java/mage/server/MageServerImpl.java +++ b/Mage.Server/src/main/java/mage/server/MageServerImpl.java @@ -128,6 +128,10 @@ public class MageServerImpl implements MageServer { @Override public boolean emailAuthToken(String sessionId, String email) throws MageException { + if (!ConfigSettings.getInstance().isAuthenticationActivated()) { + sendErrorMessageToClient(sessionId, "Registration is disabled by the server config"); + return false; + } AuthorizedUser authorizedUser = AuthorizedUserRepository.instance.getByEmail(email); if (authorizedUser == null) { sendErrorMessageToClient(sessionId, "No user was found with the email address " + email); @@ -147,6 +151,10 @@ public class MageServerImpl implements MageServer { @Override public boolean resetPassword(String sessionId, String email, String authToken, String password) throws MageException { + if (!ConfigSettings.getInstance().isAuthenticationActivated()) { + sendErrorMessageToClient(sessionId, "Registration is disabled by the server config"); + return false; + } String storedAuthToken = activeAuthTokens.get(email); if (storedAuthToken == null || !storedAuthToken.equals(authToken)) { sendErrorMessageToClient(sessionId, "Invalid auth token");