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

rewrote some streams and optionals

Browse source
This commit is contained in:
ingmargoudt 2017-04-01 22:45:12 +02:00
parent d0bf77cedf
commit 594ffa2754
29 changed files with 199 additions and 273 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage/src/main/java/mage/game/GameImpl.java
View file

@ -503,12 +503,12 @@ public abstract class GameImpl implements Game, Serializable {
}
@Override
public Ability getAbility(UUID abilityId, UUID sourceId) {
public Optional<Ability> getAbility(UUID abilityId, UUID sourceId) {
MageObject object = getObject(sourceId);
if (object != null) {
return object.getAbilities().get(abilityId);
}
return null;
return Optional.empty();
}
// @Override
@ -2336,10 +2336,10 @@ public abstract class GameImpl implements Game, Serializable {
}
}
Iterator it = gameCards.entrySet().iterator();
Iterator<Entry<UUID, Card>> it = gameCards.entrySet().iterator();
while (it.hasNext()) {
Entry<UUID, Card> entry = (Entry<UUID, Card>) it.next();
Entry<UUID, Card> entry = it.next();
Card card = entry.getValue();
if (card.getOwnerId().equals(playerId)) {
it.remove();