Merge branch 'aicleanup' into 'master'

Minor cleanup

See merge request core-developers/forge!4705
This commit is contained in:
Michael Kamensky
2021-05-16 12:43:17 +00:00
33 changed files with 61 additions and 152 deletions

View File

@@ -1233,7 +1233,6 @@ public class AbilityUtils {
}
else if (defined.startsWith("PlayerNamed_")) {
for (Player p : game.getPlayersInTurnOrder()) {
//System.out.println("Named player " + defined.substring(12));
if (p.getName().equals(defined.substring(12))) {
players.add(p);
}

View File

@@ -220,7 +220,6 @@ public class CardFactory {
return getCard(cp, owner, owner == null ? -1 : owner.getGame().nextCardId(), game);
}
public final static Card getCard(final IPaperCard cp, final Player owner, final int cardId, final Game game) {
//System.out.println(cardName);
CardRules cardRules = cp.getRules();
final Card c = readCard(cardRules, cp, cardId, game);
c.setRules(cardRules);

View File

@@ -2681,11 +2681,6 @@ public class Player extends GameEntity implements Comparable<Player> {
//getZone(ZoneType.Command).add(c);
}
//DBG
//System.out.println("CurrentPlanes: " + currentPlanes);
//System.out.println("ActivePlanes: " + game.getActivePlanes());
//System.out.println("CommandPlanes: " + getZone(ZoneType.Command).getCards());
game.setActivePlanes(currentPlanes);
//Run PlaneswalkedTo triggers here.
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
@@ -2710,11 +2705,6 @@ public class Player extends GameEntity implements Comparable<Player> {
game.getAction().moveTo(ZoneType.PlanarDeck, plane,-1, null);
}
currentPlanes.clear();
//DBG
//System.out.println("CurrentPlanes: " + currentPlanes);
//System.out.println("ActivePlanes: " + game.getActivePlanes());
//System.out.println("CommandPlanes: " + getZone(ZoneType.Command).getCards());
}
/**