From 78188d6f24b3cef63b693085211cde8fbd21eb38 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Mon, 22 Jun 2015 15:31:15 +0200
Subject: [PATCH] Removed dispay of card ID for looked at cards to prevent
unfair use of card identity.
---
Mage.Common/src/mage/view/LookedAtView.java | 2 +-
.../src/test/java/org/mage/test/player/TestPlayer.java | 7 ++++++-
Mage/src/mage/game/LookedAt.java | 7 ++++---
Mage/src/mage/players/Player.java | 2 ++
Mage/src/mage/players/PlayerImpl.java | 6 ++++++
5 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/Mage.Common/src/mage/view/LookedAtView.java b/Mage.Common/src/mage/view/LookedAtView.java
index db1759c0c0..a7485e7120 100644
--- a/Mage.Common/src/mage/view/LookedAtView.java
+++ b/Mage.Common/src/mage/view/LookedAtView.java
@@ -46,7 +46,7 @@ public class LookedAtView implements Serializable {
public LookedAtView(String name, Cards cards, Game game) {
this.name = name;
for (Card card: cards.getCards(game)) {
- this.cards.put(card.getId(), new CardView(card, game, card.getId()));
+ this.cards.put(card.getId(), new SimpleCardView(card.getId(), card.getExpansionSetCode(), card.getCardNumber(), card.getUsesVariousArt(), card.getTokenSetCode()));
}
}
diff --git a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
index be7c65487a..6de99aff26 100644
--- a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
+++ b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
@@ -1127,7 +1127,12 @@ public class TestPlayer implements Player {
public void lookAtCards(String name, Cards cards, Game game) {
computerPlayer.lookAtCards(name, cards, game);
}
-
+
+ @Override
+ public void lookAtCards(String name, Card card, Game game) {
+ computerPlayer.lookAtCards(name, card, game);
+ }
+
@Override
public void phasing(Game game) {
computerPlayer.phasing(game);
diff --git a/Mage/src/mage/game/LookedAt.java b/Mage/src/mage/game/LookedAt.java
index 17b8af9b8a..501cb34c70 100644
--- a/Mage/src/mage/game/LookedAt.java
+++ b/Mage/src/mage/game/LookedAt.java
@@ -52,13 +52,14 @@ public class LookedAt extends HashMap<String, Cards> implements Serializable, Co
}
}
- public void add(String name, Card card) {
- this.get(name).add(card);
+ public void add(String name, Card card) {
+ this.createLookedAt(name).add(card);
}
public void add(String name, Cards cards) {
- if (!this.containsKey(name))
+ if (!this.containsKey(name)) {
createLookedAt(name);
+ }
this.put(name, cards.copy());
}
diff --git a/Mage/src/mage/players/Player.java b/Mage/src/mage/players/Player.java
index c2f4a016ac..c369e8f045 100644
--- a/Mage/src/mage/players/Player.java
+++ b/Mage/src/mage/players/Player.java
@@ -293,6 +293,7 @@ public interface Player extends MageItem, Copyable<Player> {
void revealCards(String name, Cards cards, Game game);
void revealCards(String name, Cards cards, Game game, boolean postToLog);
+ void lookAtCards(String name, Card card, Game game);
void lookAtCards(String name, Cards cards, Game game);
@Override
@@ -488,6 +489,7 @@ public interface Player extends MageItem, Copyable<Player> {
* @param sourceId
* @param game
* @param fromZone if null, this info isn't postet
+ * @param withName
* @return
*/
boolean moveCardToExileWithInfo(Card card, UUID exileId, String exileName, UUID sourceId, Game game, Zone fromZone, boolean withName);
diff --git a/Mage/src/mage/players/PlayerImpl.java b/Mage/src/mage/players/PlayerImpl.java
index 65228de1e6..fe29574f39 100644
--- a/Mage/src/mage/players/PlayerImpl.java
+++ b/Mage/src/mage/players/PlayerImpl.java
@@ -1332,6 +1332,12 @@ public abstract class PlayerImpl implements Player, Serializable {
}
}
+ @Override
+ public void lookAtCards(String name, Card card, Game game) {
+ game.getState().getLookedAt(this.playerId).add(name, card);
+ game.fireUpdatePlayersEvent();
+ }
+
@Override
public void lookAtCards(String name, Cards cards, Game game) {
game.getState().getLookedAt(this.playerId).add(name, cards);