External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-28 14:32:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

game: fixed cube from deck game mode to use a card numbers (#11105)

Browse source
This commit is contained in:
Susucre 2023-09-03 21:13:37 +02:00 • committed by GitHub
parent c36e5c4a1c
commit 9532310e06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Mage/src/main/java/mage/game/draft/DraftCube.java
View file

@ -17,28 +17,32 @@ public abstract class DraftCube {
public class CardIdentity {
private String name;
private String extension;
private final String name;
private final String extension;
/**
* optional number in the extension (some sets have multiple version of a card)
* null means no set one.
*/
private final String number;
public CardIdentity(String name, String extension) {
this(name, extension, null);
}
public CardIdentity(String name, String extension, String number) {
this.name = name;
this.extension = extension;
this.number = number;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getExtension() {
return extension;
}
public void setExtension(String extension) {
this.extension = extension;
public String getCardNumber() {
return number;
}
}
@ -84,7 +88,9 @@ public abstract class DraftCube {
if (!cardId.getName().isEmpty()) {
CardInfo cardInfo = null;
if (!cardId.getExtension().isEmpty()) {
cardInfo = CardRepository.instance.findCardWithPreferredSetAndNumber(cardId.getName(), cardId.getExtension(), null);
cardInfo = CardRepository.instance.findCardWithPreferredSetAndNumber(
cardId.getName(), cardId.getExtension(), cardId.getCardNumber()
);
} else {
cardInfo = CardRepository.instance.findPreferredCoreExpansionCard(cardId.getName());
}