External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-10 21:02:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2016-11-03 22:38:14 +01:00
commit a4e1c7aefd
41 changed files with 1395 additions and 640 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
View file

@ -1868,13 +1868,13 @@ public class TestPlayer implements Player {
}
@Override
public void setCommanderId(UUID commanderId) {
computerPlayer.setCommanderId(commanderId);
public void addCommanderId(UUID commanderId) {
computerPlayer.addCommanderId(commanderId);
}
@Override
public UUID getCommanderId() {
return computerPlayer.getCommanderId();
public Set<UUID> getCommandersIds() {
return computerPlayer.getCommandersIds();
}
@Override

4
Mage.Tests/src/test/java/org/mage/test/stub/PlayerStub.java
View file

@ -1083,12 +1083,12 @@ public class PlayerStub implements Player {
}
@Override
public void setCommanderId(UUID commanderId) {
public void addCommanderId(UUID commanderId) {
}
@Override
public UUID getCommanderId() {
public Set<UUID> getCommandersIds() {
return null;
}