From 8221a68efef88ec196de1ac07721de1032fc99b3 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 5 Sep 2017 17:53:03 +0200 Subject: [PATCH 1/5] Minor fix for user handling. --- .../java/mage/server/tournament/TournamentSession.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 cf4b16ee862..8819f262ecb 100644 --- a/Mage.Server/src/main/java/mage/server/tournament/TournamentSession.java +++ b/Mage.Server/src/main/java/mage/server/tournament/TournamentSession.java @@ -170,9 +170,11 @@ public class TournamentSession { } private void removeTournamentForUser() { - UserManager.instance.getUser(userId).ifPresent(user - -> user.removeTournament(playerId)); - + Optional user = UserManager.instance.getUser(userId); + if (user.isPresent()) { + user.get().removeTable(playerId); + user.get().removeTournament(playerId); + } } } From c37ac867051009deff0bd3bb19d20595b14df00f Mon Sep 17 00:00:00 2001 From: nachazo <19270296+nachazo@users.noreply.github.com> Date: Wed, 6 Sep 2017 11:09:49 +0200 Subject: [PATCH 2/5] Update Exodus.java --- Mage.Sets/src/mage/sets/Exodus.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Mage.Sets/src/mage/sets/Exodus.java b/Mage.Sets/src/mage/sets/Exodus.java index 0221bc232c3..0cf1c1eecfb 100644 --- a/Mage.Sets/src/mage/sets/Exodus.java +++ b/Mage.Sets/src/mage/sets/Exodus.java @@ -136,6 +136,7 @@ public class Exodus extends ExpansionSet { cards.add(new SetCardInfo("Rootwater Mystic", 44, Rarity.COMMON, mage.cards.r.RootwaterMystic.class)); cards.add(new SetCardInfo("Sabertooth Wyvern", 99, Rarity.UNCOMMON, mage.cards.s.SabertoothWyvern.class)); cards.add(new SetCardInfo("School of Piranha", 45, Rarity.COMMON, mage.cards.s.SchoolOfPiranha.class)); + cards.add(new SetCardInfo("ScareTactics", 73, Rarity.COMMON, mage.cards.s.ScareTactics.class)); cards.add(new SetCardInfo("Scrivener", 46, Rarity.UNCOMMON, mage.cards.s.Scrivener.class)); cards.add(new SetCardInfo("Seismic Assault", 101, Rarity.RARE, mage.cards.s.SeismicAssault.class)); cards.add(new SetCardInfo("Shackles", 18, Rarity.COMMON, mage.cards.s.Shackles.class)); From b7224fe42a8ed4c6687ec2c2687e83bca2930cc2 Mon Sep 17 00:00:00 2001 From: nachazo <19270296+nachazo@users.noreply.github.com> Date: Wed, 6 Sep 2017 11:10:45 +0200 Subject: [PATCH 3/5] Add files via upload --- Mage.Sets/src/mage/cards/s/ScareTactics.java | 58 ++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 Mage.Sets/src/mage/cards/s/ScareTactics.java diff --git a/Mage.Sets/src/mage/cards/s/ScareTactics.java b/Mage.Sets/src/mage/cards/s/ScareTactics.java new file mode 100644 index 00000000000..582716bd0b7 --- /dev/null +++ b/Mage.Sets/src/mage/cards/s/ScareTactics.java @@ -0,0 +1,58 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.cards.s; + +import java.util.UUID; +import mage.abilities.effects.common.continuous.BoostControlledEffect; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; + +/** + * + * @author Ekkaia + */ +public class ScareTactics extends CardImpl { + + public ScareTactics(UUID ownerId, CardSetInfo setInfo) { + super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{B}"); + + // Creatures you control get +1/+0 until end of turn. + this.getSpellAbility().addEffect(new BoostControlledEffect(1, 0, Duration.EndOfTurn)); + } + + public ScareTactics(final ScareTactics card) { + super(card); + } + + @Override + public ScareTactics copy() { + return new ScareTactics(this); + } +} \ No newline at end of file From d0aa1d3cd9ce5791814ed13fd1a0fdc4d144ec49 Mon Sep 17 00:00:00 2001 From: nachazo <19270296+nachazo@users.noreply.github.com> Date: Wed, 6 Sep 2017 11:15:03 +0200 Subject: [PATCH 4/5] Update Exodus.java --- Mage.Sets/src/mage/sets/Exodus.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/sets/Exodus.java b/Mage.Sets/src/mage/sets/Exodus.java index 0cf1c1eecfb..05b9ae6630c 100644 --- a/Mage.Sets/src/mage/sets/Exodus.java +++ b/Mage.Sets/src/mage/sets/Exodus.java @@ -135,8 +135,8 @@ public class Exodus extends ExpansionSet { cards.add(new SetCardInfo("Rootwater Alligator", 122, Rarity.COMMON, mage.cards.r.RootwaterAlligator.class)); cards.add(new SetCardInfo("Rootwater Mystic", 44, Rarity.COMMON, mage.cards.r.RootwaterMystic.class)); cards.add(new SetCardInfo("Sabertooth Wyvern", 99, Rarity.UNCOMMON, mage.cards.s.SabertoothWyvern.class)); - cards.add(new SetCardInfo("School of Piranha", 45, Rarity.COMMON, mage.cards.s.SchoolOfPiranha.class)); cards.add(new SetCardInfo("ScareTactics", 73, Rarity.COMMON, mage.cards.s.ScareTactics.class)); + cards.add(new SetCardInfo("School of Piranha", 45, Rarity.COMMON, mage.cards.s.SchoolOfPiranha.class)); cards.add(new SetCardInfo("Scrivener", 46, Rarity.UNCOMMON, mage.cards.s.Scrivener.class)); cards.add(new SetCardInfo("Seismic Assault", 101, Rarity.RARE, mage.cards.s.SeismicAssault.class)); cards.add(new SetCardInfo("Shackles", 18, Rarity.COMMON, mage.cards.s.Shackles.class)); From e4bd858eba8e024a5b0e8c62afe7379847e8c781 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Wed, 6 Sep 2017 16:58:08 +0200 Subject: [PATCH 5/5] Added SWS to sets data. --- Utils/mtg-sets-data.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Utils/mtg-sets-data.txt b/Utils/mtg-sets-data.txt index b1ce0269945..f5b538022d1 100644 --- a/Utils/mtg-sets-data.txt +++ b/Utils/mtg-sets-data.txt @@ -204,3 +204,4 @@ Weatherlight|WTH| Worldwake|WWK| Ixalan|XLN| Zendikar|ZEN| +Star Wars|SWS|