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

Removed redundant remove user from chat call and some formatting.

Browse source
This commit is contained in:
LevelX2 2014-06-16 07:48:15 +02:00
parent 2c85c54b9f
commit b360bb1528
4 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage.Common/src/mage/view/RevealedView.java
View file

@ -39,8 +39,8 @@ import mage.game.Game;
*/ */
public class RevealedView implements Serializable { public class RevealedView implements Serializable {
private String name; private final String name;
private SimpleCardsView cards = new SimpleCardsView(); private final SimpleCardsView cards = new SimpleCardsView();
public RevealedView(String name, Cards cards, Game game) { public RevealedView(String name, Cards cards, Game game) {
this.name = name; this.name = name;

6
Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
View file

@ -45,12 +45,8 @@ import mage.abilities.PlayLandAbility;
import mage.abilities.SpecialAction; import mage.abilities.SpecialAction;
import mage.abilities.SpellAbility; import mage.abilities.SpellAbility;
import mage.abilities.TriggeredAbility; import mage.abilities.TriggeredAbility;
import mage.abilities.costs.Cost;
import mage.abilities.costs.VariableCost; import mage.abilities.costs.VariableCost;
import mage.abilities.costs.common.PayLifeCost;
import mage.abilities.costs.common.RemoveCounterCost;
import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.SacrificeSourceCost;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.costs.mana.ManaCost; import mage.abilities.costs.mana.ManaCost;
import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.costs.mana.PhyrexianManaCost; import mage.abilities.costs.mana.PhyrexianManaCost;
@ -343,7 +339,7 @@ public class HumanPlayer extends PlayerImpl {
Map<String, Serializable> options = getOptions(target); Map<String, Serializable> options = getOptions(target);
if (target.getTargets().size() > 0) { if (target.getTargets().size() > 0) {
if (options == null) { if (options == null) {
options = new HashMap<String, Serializable>(1); options = new HashMap<>(1);
} }
List<UUID> chosen = (List<UUID>)target.getTargets(); List<UUID> chosen = (List<UUID>)target.getTargets();
options.put("chosen", (Serializable)chosen); options.put("chosen", (Serializable)chosen);

1
Mage.Server/src/main/java/mage/server/UserManager.java
View file

@ -129,7 +129,6 @@ public class UserManager {
.append(" userId: ").append(userId) .append(" userId: ").append(userId)
.append(" sessionId: ").append(user.getSessionId()) .append(" sessionId: ").append(user.getSessionId())
.append(" Reason: ").append(reason.toString())); .append(" Reason: ").append(reason.toString()));
ChatManager.getInstance().removeUser(userId, reason);
user.kill(reason); user.kill(reason);
users.remove(userId); users.remove(userId);
} else { } else {

2
Mage.Sets/src/mage/sets/gatecrash/GideonChampionOfJustice.java
View file

@ -67,7 +67,7 @@ public class GideonChampionOfJustice extends CardImpl {
// +1: Put a loyalty counter on Gideon, Champion of Justice for each creature target opponent controls. // +1: Put a loyalty counter on Gideon, Champion of Justice for each creature target opponent controls.
LoyaltyAbility ability1 = new LoyaltyAbility( LoyaltyAbility ability1 = new LoyaltyAbility(
new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(0), new PermanentsTargetOpponentControlsCount(), false), 1); new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(0), new PermanentsTargetOpponentControlsCount(), true), 1);
ability1.addTarget(new TargetOpponent()); ability1.addTarget(new TargetOpponent());
this.addAbility(ability1); this.addAbility(ability1);