diff --git a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java index fa12b115f55..851c1f69f94 100644 --- a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java @@ -415,7 +415,7 @@ public class HumanPlayer extends PlayerImpl { public boolean chooseTargetAmount(Outcome outcome, TargetAmount target, Ability source, Game game) { updateGameStatePriority("chooseTargetAmount", game); while (!abort) { - game.fireSelectTargetEvent(playerId, target.getMessage() + "\n Amount remaining:" + target.getAmountRemaining(), target.possibleTargets(source==null?null:source.getId(), playerId, game), target.isRequired(source), null); + game.fireSelectTargetEvent(playerId, target.getMessage() + "\n Amount remaining:" + target.getAmountRemaining(), target.possibleTargets(source==null?null:source.getSourceId(), playerId, game), target.isRequired(source), null); waitForResponse(game); if (response.getUUID() != null) { if (target.canTarget(response.getUUID(), source, game)) { diff --git a/Mage.Server/src/main/java/mage/server/ChatManager.java b/Mage.Server/src/main/java/mage/server/ChatManager.java index fa5c4e80543..2e9605bfb05 100644 --- a/Mage.Server/src/main/java/mage/server/ChatManager.java +++ b/Mage.Server/src/main/java/mage/server/ChatManager.java @@ -65,7 +65,7 @@ public class ChatManager { if (chatSessions.containsKey(chatId)) { chatSessions.get(chatId).join(userId); } else { - logger.warn("User could not join chatId: " + chatId +" userId: " + userId); + logger.trace("User could not join chatId: " + chatId +" userId: " + userId); } } @@ -81,7 +81,7 @@ public class ChatManager { chatSessions.remove(chatId); logger.debug("Chat removed - chatId: " + chatId); } else { - logger.warn("Chat to destroy does not exist - chatId: " + chatId); + logger.trace("Chat to destroy does not exist - chatId: " + chatId); } } diff --git a/Mage.Server/src/main/java/mage/server/MageServerImpl.java b/Mage.Server/src/main/java/mage/server/MageServerImpl.java index 181ed6cb00f..0b82b7db43c 100644 --- a/Mage.Server/src/main/java/mage/server/MageServerImpl.java +++ b/Mage.Server/src/main/java/mage/server/MageServerImpl.java @@ -139,7 +139,9 @@ public class MageServerImpl implements MageServer { if (logger.isDebugEnabled()) { User user = UserManager.getInstance().getUser(userId); if (user != null) { - logger.debug(user.getName() + " created tableId: " + table.getTableId()); + logger.debug("TABLE created - tableId: " + table.getTableId()); + logger.debug("- " + user.getName() + " userId: " + user.getId()); + logger.debug("- chatId: " + TableManager.getInstance().getChatId(table.getTableId())); } } LogServiceImpl.instance.log(LogKeys.KEY_TABLE_CREATED, sessionId, userId.toString(), table.getTableId().toString()); diff --git a/Mage.Sets/src/mage/sets/conflux/HellsparkElemental.java b/Mage.Sets/src/mage/sets/conflux/HellsparkElemental.java index 4e7a4f78091..99a89754471 100644 --- a/Mage.Sets/src/mage/sets/conflux/HellsparkElemental.java +++ b/Mage.Sets/src/mage/sets/conflux/HellsparkElemental.java @@ -56,9 +56,14 @@ public class HellsparkElemental extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(1); + // Trample, haste this.addAbility(TrampleAbility.getInstance()); this.addAbility(HasteAbility.getInstance()); + + // At the beginning of the end step, sacrifice Hellspark Elemental. this.addAbility(new OnEventTriggeredAbility(EventType.END_TURN_STEP_PRE, "beginning of the end step", true, new SacrificeSourceEffect())); + + // Unearth {1}{R} ({1}{R}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.) this.addAbility(new UnearthAbility(new ManaCostsImpl("{1}{R}"))); }