Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Code cleanup: protect all copy constructors (#10750)

Browse source 
* apply regex to change public copy constructors to protected
* cleanup code using now protected constructors
* fix manaBuilder weird casting of Mana into ConditionalMana
This commit is contained in:
Susucre 2023-08-05 01:34:58 +02:00 • committed by GitHub
parent b04b13d530
commit f75b1c9f0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1565 changed files with 2412 additions and 2731 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Mage/src/main/java/mage/game/Revealed.java
View file

@ -6,21 +6,22 @@ import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import mage.cards.Card;
import mage.cards.Cards;
import mage.cards.CardsImpl;
import mage.util.Copyable;
/**
*
* @author BetaSteward_at_googlemail.com
*/
public class Revealed extends HashMap<String, Cards> implements Serializable, Copyable<Revealed> {
public Revealed() { }
public Revealed() {
}
public Revealed(final Revealed revealed) {
for (Map.Entry<String, Cards> entry: revealed.entrySet()) {
protected Revealed(final Revealed revealed) {
for (Map.Entry<String, Cards> entry : revealed.entrySet()) {
this.put(entry.getKey(), entry.getValue().copy());
}
}
@ -32,11 +33,11 @@ public class Revealed extends HashMap<String, Cards> implements Serializable, Co
public void update(String name, Cards cards) {
this.put(name, cards.copy());
}
public void add(String name, Cards cards) {
if (this.containsKey(name)) {
this.get(name).addAll(cards);
} else {
} else {
this.put(name, cards.copy());
}
}
@ -55,7 +56,7 @@ public class Revealed extends HashMap<String, Cards> implements Serializable, Co
}
public Card getCard(UUID cardId, Game game) {
for (Cards cards: this.values()) {
for (Cards cards : this.values()) {
if (cards.contains(cardId)) {
return game.getCard(cardId);
}