github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-25 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Changed some logging messages.

Browse source
This commit is contained in:
LevelX2 2017-04-23 14:11:02 +02:00
parent ceb7dbcdf2
commit c085ea148a
2 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,6 +27,14 @@
*/ */
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;
@ -61,15 +69,6 @@ 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
*/ */
@ -345,15 +344,14 @@ public class TableController {
Optional<Player> playerOpt = createPlayer(name, seat.getPlayerType(), skill); Optional<Player> playerOpt = createPlayer(name, seat.getPlayerType(), skill);
if (!playerOpt.isPresent()) { if (!playerOpt.isPresent()) {
String message = new StringBuilder("Could not create player ").append(name).append(" of type ").append(seat.getPlayerType()).toString(); String message = "Could not create player " + name + " of type " + seat.getPlayerType();
logger.warn(new StringBuilder("User: ").append(user.getName()).append(" => ").append(message).toString()); logger.warn("User: " + user.getName() + " => " + message);
user.showUserMessage("Join Table", message); user.showUserMessage("Join Table", message);
return false; return false;
} }
Player player = playerOpt.get(); Player player = playerOpt.get();
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", "A " + seat.getPlayerType() + " player can't join this table.");
return false; return false;
} }
match.addPlayer(player, deck); match.addPlayer(player, deck);

3
Mage/src/main/java/mage/cards/decks/Constructed.java
View file

@ -62,7 +62,6 @@ public class Constructed extends DeckValidator {
@Override @Override
public boolean validate(Deck deck) { public boolean validate(Deck deck) {
logger.debug("DECK validate start: " + name + " deckname: " + deck.getName());
boolean valid = true; boolean valid = true;
//20091005 - 100.2a //20091005 - 100.2a
if (deck.getCards().size() < 60) { if (deck.getCards().size() < 60) {
@ -136,8 +135,6 @@ public class Constructed extends DeckValidator {
} }
} }
} }
logger.debug("DECK validate end: " + name + " deckname: " + deck.getName() + " invalids:" + invalid.size());
return valid; return valid;
} }