github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-13 01:01:11 -09:00
Code Issues Projects Releases Packages Wiki Activity

Nulls to optional. Also there was bug with AetherChaser "you may pay" was not set to optional

Browse source
This commit is contained in:
doncarton 2017-02-26 15:15:54 +03:00
parent a46848791c
commit 5eaaa67d1e
5 changed files with 43 additions and 38 deletions
Mage.Server/src/main/java/mage/server
TableController.java
game
PlayerFactory.java
Mage.Sets/src/mage/cards/a
AetherChaser.java
Mage.Tests/src/test/java/org/mage/test/serverside/base
MageTestBase.java
Mage/src/main/java/mage/abilities/costs/mana
ManaCostsImpl.java

45
Mage.Server/src/main/java/mage/server/TableController.java
View file

@ -27,14 +27,6 @@
*/ */
package mage.server; package mage.server;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import mage.MageException; import mage.MageException;
import mage.cards.decks.Deck; import mage.cards.decks.Deck;
import mage.cards.decks.DeckCardLists; import mage.cards.decks.DeckCardLists;
@ -68,6 +60,15 @@ import mage.server.util.ThreadExecutor;
import mage.view.ChatMessage; import mage.view.ChatMessage;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
/** /**
* @author BetaSteward_at_googlemail.com * @author BetaSteward_at_googlemail.com
*/ */
@ -195,8 +196,9 @@ public class TableController {
return false; return false;
} }
Player player = createPlayer(name, seat.getPlayerType(), skill); Optional<Player> playerOptional = createPlayer(name, seat.getPlayerType(), skill);
if (player != null) { if (playerOptional.isPresent()) {
Player player = playerOptional.get();
if (!player.canJoinTable(table)) { if (!player.canJoinTable(table)) {
user.showUserMessage("Join Table", new StringBuilder("A ").append(seat.getPlayerType()).append(" player can't join this table.").toString()); user.showUserMessage("Join Table", new StringBuilder("A ").append(seat.getPlayerType()).append(" player can't join this table.").toString());
return false; return false;
@ -227,10 +229,11 @@ public class TableController {
} }
public synchronized boolean replaceDraftPlayer(Player oldPlayer, String name, String playerType, int skill) { public synchronized boolean replaceDraftPlayer(Player oldPlayer, String name, String playerType, int skill) {
Player newPlayer = createPlayer(name, playerType, skill); Optional<Player> newPlayerOpt = createPlayer(name, playerType, skill);
if (newPlayer == null || table.getState() != TableState.DRAFTING) { if (!newPlayerOpt.isPresent() || table.getState() != TableState.DRAFTING) {
return false; return false;
} }
Player newPlayer = newPlayerOpt.get();
TournamentPlayer oldTournamentPlayer = tournament.getPlayer(oldPlayer.getId()); TournamentPlayer oldTournamentPlayer = tournament.getPlayer(oldPlayer.getId());
tournament.removePlayer(oldPlayer.getId()); tournament.removePlayer(oldPlayer.getId());
tournament.addPlayer(newPlayer, playerType); tournament.addPlayer(newPlayer, playerType);
@ -306,13 +309,14 @@ public class TableController {
} }
} }
Player player = createPlayer(name, seat.getPlayerType(), skill); Optional<Player> playerOpt = createPlayer(name, seat.getPlayerType(), skill);
if (player == null) { if (!playerOpt.isPresent()) {
String message = new StringBuilder("Could not create player ").append(name).append(" of type ").append(seat.getPlayerType()).toString(); String message = new StringBuilder("Could not create player ").append(name).append(" of type ").append(seat.getPlayerType()).toString();
logger.warn(new StringBuilder("User: ").append(user.getName()).append(" => ").append(message).toString()); logger.warn(new StringBuilder("User: ").append(user.getName()).append(" => ").append(message).toString());
user.showUserMessage("Join Table", message); user.showUserMessage("Join Table", message);
return false; return false;
} }
Player player = playerOpt.get();
logger.debug("DECK validated: " + table.getValidator().getName() + ' ' + player.getName() + ' ' + deck.getName()); logger.debug("DECK validated: " + table.getValidator().getName() + ' ' + player.getName() + ' ' + deck.getName());
if (!player.canJoinTable(table)) { if (!player.canJoinTable(table)) {
user.showUserMessage("Join Table", new StringBuilder("A ").append(seat.getPlayerType()).append(" player can't join this table.").toString()); user.showUserMessage("Join Table", new StringBuilder("A ").append(seat.getPlayerType()).append(" player can't join this table.").toString());
@ -443,17 +447,18 @@ public class TableController {
// ReplayManager.getInstance().replayGame(table.getId(), userId); // ReplayManager.getInstance().replayGame(table.getId(), userId);
// return true; // return true;
// } // }
private Player createPlayer(String name, String playerType, int skill) { private Optional<Player> createPlayer(String name, String playerType, int skill) {
Player player; Optional<Player> playerOpt;
if (options == null) { if (options == null) {
player = PlayerFactory.getInstance().createPlayer(playerType, name, RangeOfInfluence.ALL, skill); playerOpt = PlayerFactory.getInstance().createPlayer(playerType, name, RangeOfInfluence.ALL, skill);
} else { } else {
player = PlayerFactory.getInstance().createPlayer(playerType, name, options.getRange(), skill); playerOpt = PlayerFactory.getInstance().createPlayer(playerType, name, options.getRange(), skill);
} }
if (player != null) { if (playerOpt.isPresent()) {
Player player = playerOpt.get();
logger.trace("Player " + player.getName() + " created id: " + player.getId()); logger.trace("Player " + player.getName() + " created id: " + player.getId());
} }
return player; return playerOpt;
} }
public void leaveTableAll() { public void leaveTableAll() {

16
Mage.Server/src/main/java/mage/server/game/PlayerFactory.java
View file

@ -28,14 +28,16 @@
package mage.server.game; package mage.server.game;
import java.lang.reflect.Constructor;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
import mage.constants.RangeOfInfluence; import mage.constants.RangeOfInfluence;
import mage.players.Player; import mage.players.Player;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import java.lang.reflect.Constructor;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
/** /**
* *
* @author BetaSteward_at_googlemail.com * @author BetaSteward_at_googlemail.com
@ -53,14 +55,14 @@ public class PlayerFactory {
private PlayerFactory() {} private PlayerFactory() {}
public Player createPlayer(String playerType, String name, RangeOfInfluence range, int skill) { public Optional<Player> createPlayer(String playerType, String name, RangeOfInfluence range, int skill) {
try { try {
Class playerTypeClass = playerTypes.get(playerType); Class playerTypeClass = playerTypes.get(playerType);
if (playerTypeClass != null) { if (playerTypeClass != null) {
Constructor<?> con = playerTypeClass.getConstructor(String.class, RangeOfInfluence.class, int.class); Constructor<?> con = playerTypeClass.getConstructor(String.class, RangeOfInfluence.class, int.class);
Player player = (Player) con.newInstance(name, range, skill); Player player = (Player) con.newInstance(name, range, skill);
logger.trace("Player created: " + name + " - " + player.getId()); logger.trace("Player created: " + name + " - " + player.getId());
return player; return Optional.of(player);
} }
else { else {
logger.fatal("Unknown player type: " + playerType); logger.fatal("Unknown player type: " + playerType);
@ -68,7 +70,7 @@ public class PlayerFactory {
} catch (Exception ex) { } catch (Exception ex) {
logger.fatal("PlayerFactory error ", ex); logger.fatal("PlayerFactory error ", ex);
} }
return null; return Optional.empty();
} }
public Set<String> getPlayerTypes() { public Set<String> getPlayerTypes() {

5
Mage.Sets/src/mage/cards/a/AetherChaser.java
View file

@ -27,7 +27,6 @@
*/ */
package mage.cards.a; package mage.cards.a;
import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.AttacksTriggeredAbility;
import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility;
@ -41,6 +40,8 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.game.permanent.token.ServoToken; import mage.game.permanent.token.ServoToken;
import java.util.UUID;
/** /**
* *
* @author fireshoes * @author fireshoes
@ -62,7 +63,7 @@ public class AetherChaser extends CardImpl {
this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(2))); this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(2)));
// Whenever Aether Chaser attacks, you may pay {E}{E}. If you do, create a 1/1 colorless Servo artifact creature token. // Whenever Aether Chaser attacks, you may pay {E}{E}. If you do, create a 1/1 colorless Servo artifact creature token.
this.addAbility(new AttacksTriggeredAbility(new DoIfCostPaid(new CreateTokenEffect(new ServoToken()), new PayEnergyCost(2)), false, this.addAbility(new AttacksTriggeredAbility(new DoIfCostPaid(new CreateTokenEffect(new ServoToken()), new PayEnergyCost(2)), true,
"Whenever {this} attacks you may pay {E}{E}. If you do, create a 1/1 colorless Servo artifact creature token.")); "Whenever {this} attacks you may pay {E}{E}. If you do, create a 1/1 colorless Servo artifact creature token."));
} }

4
Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestBase.java
View file

@ -28,7 +28,6 @@ import org.mage.test.player.TestPlayer;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FilenameFilter; import java.io.FilenameFilter;
import java.lang.reflect.InvocationTargetException;
import java.util.*; import java.util.*;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -297,7 +296,8 @@ public abstract class MageTestBase {
} }
protected Player createPlayer(String name, String playerType) { protected Player createPlayer(String name, String playerType) {
return PlayerFactory.getInstance().createPlayer(playerType, name, RangeOfInfluence.ALL, 5); Optional<Player> playerOptional = PlayerFactory.getInstance().createPlayer(playerType, name, RangeOfInfluence.ALL, 5);
return playerOptional.orElseThrow(() -> new NullPointerException("PlayerFactory error - player is not created"));
} }
protected Player createRandomPlayer(String name) { protected Player createRandomPlayer(String name) {

11
Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java
View file

@ -27,11 +27,6 @@
*/ */
package mage.abilities.costs.mana; package mage.abilities.costs.mana;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import mage.Mana; import mage.Mana;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.costs.Cost; import mage.abilities.costs.Cost;
@ -45,13 +40,15 @@ import mage.players.Player;
import mage.target.Targets; import mage.target.Targets;
import mage.util.ManaUtil; import mage.util.ManaUtil;
import java.util.*;
/** /**
* @author BetaSteward_at_googlemail.com * @author BetaSteward_at_googlemail.com
* @param <T> * @param <T>
*/ */
public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements ManaCosts<T> { public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements ManaCosts<T> {
protected UUID id; protected final UUID id;
protected String text = null; protected String text = null;
private static Map<String, ManaCosts> costs = new HashMap<>(); private static Map<String, ManaCosts> costs = new HashMap<>();
@ -323,7 +320,7 @@ public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements M
if (mana == null || mana.isEmpty()) { if (mana == null || mana.isEmpty()) {
return; return;
} }
String[] symbols = mana.split("^\\{|\\}\\{|\\}$"); String[] symbols = mana.split("^\\{|}\\{|}$");
int modifierForX = 0; int modifierForX = 0;
for (String symbol : symbols) { for (String symbol : symbols) {
if (!symbol.isEmpty()) { if (!symbol.isEmpty()) {