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

Fixes issue 19.

Browse source
This commit is contained in:
maurer.it 2010-12-26 14:06:25 -05:00
parent efe55aff76
commit f929d79b24
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Mage.Common/src/mage/view/CardsView.java
View file

@ -31,8 +31,10 @@ package mage.view;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.UUID; import java.util.UUID;
import mage.Constants.Zone;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.cards.Card; import mage.cards.Card;
import mage.game.Game;
import mage.game.GameState; import mage.game.GameState;
/** /**
@ -57,6 +59,25 @@ public class CardsView extends HashMap<UUID, CardView> {
// } // }
// } // }
public CardsView ( Collection<? extends Ability> abilities, Game game ) {
for ( Ability ability : abilities ) {
Card sourceCard = null;
String sourceName = null;
switch ( ability.getZone() ) {
case EXILED:
case GRAVEYARD:
sourceCard = game.getCard(ability.getSourceId());
sourceName = sourceCard.getName();
break;
case BATTLEFIELD:
sourceCard = game.getState().getPermanent(ability.getSourceId());
sourceName = sourceCard.getName();
break;
}
this.put(ability.getId(), new AbilityView(ability, sourceName, new CardView(sourceCard)));
}
}
public CardsView(Collection<? extends Ability> abilities, GameState state) { public CardsView(Collection<? extends Ability> abilities, GameState state) {
for (Ability ability: abilities) { for (Ability ability: abilities) {
Card sourceCard = state.getPermanent(ability.getSourceId()); Card sourceCard = state.getPermanent(ability.getSourceId());

2
Mage.Server/src/main/java/mage/server/game/GameController.java
View file

@ -343,7 +343,7 @@ public class GameController implements GameCallback {
private synchronized void target(UUID playerId, String question, Collection<? extends Ability> abilities, boolean required) { private synchronized void target(UUID playerId, String question, Collection<? extends Ability> abilities, boolean required) {
if (gameSessions.containsKey(playerId)) if (gameSessions.containsKey(playerId))
gameSessions.get(playerId).target(question, new CardsView(abilities, game.getState()), null, required, getGameView(playerId)); gameSessions.get(playerId).target(question, new CardsView(abilities, game), null, required, getGameView(playerId));
informOthers(playerId); informOthers(playerId);
} }