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

Merge fix

Browse source
This commit is contained in:
Oleg Agafonov 2023-11-18 15:36:55 +04:00
parent 515444affd
commit 4f081c0918
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Mage.Tests/src/test/java/org/mage/test/utils/CardHintsTest.java
View file

@ -16,6 +16,9 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/**
* @author JayDi85
*/
public class CardHintsTest extends CardTestCommanderDuelBase { public class CardHintsTest extends CardTestCommanderDuelBase {
// html logs/names used all around xmage (game logs, chats, choose dialogs, etc) // html logs/names used all around xmage (game logs, chats, choose dialogs, etc)
@ -114,7 +117,7 @@ public class CardHintsTest extends CardTestCommanderDuelBase {
setStopAt(1, PhaseStep.DECLARE_ATTACKERS); setStopAt(1, PhaseStep.DECLARE_ATTACKERS);
execute(); execute();
// colleat all possible objects and test logs with it // collect all possible objects and test logs with it
List<MageObject> sampleObjects = new ArrayList<>(); List<MageObject> sampleObjects = new ArrayList<>();
sampleObjects.addAll(currentGame.getBattlefield().getAllPermanents()); sampleObjects.addAll(currentGame.getBattlefield().getAllPermanents());
sampleObjects.addAll(playerA.getHand().getCards(currentGame)); sampleObjects.addAll(playerA.getHand().getCards(currentGame));

3
Mage/src/main/java/mage/abilities/condition/common/SourceMatchesFilterCondition.java
View file

@ -21,6 +21,9 @@ public class SourceMatchesFilterCondition implements Condition {
} }
public SourceMatchesFilterCondition(String text, FilterPermanent filter) { public SourceMatchesFilterCondition(String text, FilterPermanent filter) {
if (filter == null) {
throw new IllegalArgumentException("Wrong code usage: filter param can't be empty");
}
this.FILTER = filter; this.FILTER = filter;
this.text = text; this.text = text;
} }