From 0115052b817838b21787851c3265d841161291a6 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 30 Jun 2014 01:04:29 +0200 Subject: [PATCH] * Fixed a bug that you can't create tournaments with AI players (Showing the "You can join a table only one time." message). --- .../src/main/java/mage/server/TableController.java | 2 +- .../mage/server/tournament/TournamentManager.java | 2 +- Mage/src/mage/abilities/costs/Cost.java | 1 - .../abilities/costs/common/SacrificeTargetCost.java | 13 ++++++------- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Mage.Server/src/main/java/mage/server/TableController.java b/Mage.Server/src/main/java/mage/server/TableController.java index c573f0ba4ca..9e74462f82c 100644 --- a/Mage.Server/src/main/java/mage/server/TableController.java +++ b/Mage.Server/src/main/java/mage/server/TableController.java @@ -160,7 +160,7 @@ public class TableController { logger.fatal(new StringBuilder("couldn't get user ").append(name).append(" for join tornament userId = ").append(userId).toString()); return false; } - if (userPlayerMap.containsKey(userId)){ + if (userPlayerMap.containsKey(userId) && playerType.equals("Human")){ user.showUserMessage("Join Table", new StringBuilder("You can join a table only one time.").toString()); return false; } diff --git a/Mage.Server/src/main/java/mage/server/tournament/TournamentManager.java b/Mage.Server/src/main/java/mage/server/tournament/TournamentManager.java index 21d1d780ecf..294cfc851ce 100644 --- a/Mage.Server/src/main/java/mage/server/tournament/TournamentManager.java +++ b/Mage.Server/src/main/java/mage/server/tournament/TournamentManager.java @@ -42,7 +42,7 @@ public class TournamentManager { private static final TournamentManager INSTANCE = new TournamentManager(); - private ConcurrentHashMap controllers = new ConcurrentHashMap(); + private final ConcurrentHashMap controllers = new ConcurrentHashMap<>(); public static TournamentManager getInstance() { return INSTANCE; diff --git a/Mage/src/mage/abilities/costs/Cost.java b/Mage/src/mage/abilities/costs/Cost.java index 61146cf5b9c..3c30aa1888f 100644 --- a/Mage/src/mage/abilities/costs/Cost.java +++ b/Mage/src/mage/abilities/costs/Cost.java @@ -30,7 +30,6 @@ package mage.abilities.costs; import java.io.Serializable; import java.util.UUID; - import mage.abilities.Ability; import mage.game.Game; import mage.target.Targets; diff --git a/Mage/src/mage/abilities/costs/common/SacrificeTargetCost.java b/Mage/src/mage/abilities/costs/common/SacrificeTargetCost.java index fe19622b153..e49ec14471e 100644 --- a/Mage/src/mage/abilities/costs/common/SacrificeTargetCost.java +++ b/Mage/src/mage/abilities/costs/common/SacrificeTargetCost.java @@ -28,16 +28,15 @@ package mage.abilities.costs.common; -import mage.constants.Outcome; -import mage.abilities.Ability; -import mage.abilities.costs.CostImpl; -import mage.game.Game; -import mage.game.permanent.Permanent; -import mage.target.common.TargetControlledPermanent; - import java.util.ArrayList; import java.util.List; import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.costs.CostImpl; +import mage.constants.Outcome; +import mage.game.Game; +import mage.game.permanent.Permanent; +import mage.target.common.TargetControlledPermanent; /** *