external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch 'Guavafix' into 'master'"

Browse Source 
This reverts merge request !217
This commit is contained in:
Michael Kamensky
2018-02-18 18:54:20 +00:00
parent 0c005bb3ff
commit 275e1be6be
6 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-game/src/main/java/forge/game/player/PlayerView.java
View File

@@ -3,7 +3,6 @@ package forge.game.player;
import java.util.*;
import java.util.Map.Entry;
import com.google.common.base.MoreObjects;
import forge.card.CardType;
import forge.card.mana.ManaAtom;
import forge.game.card.CounterType;
@@ -92,7 +91,7 @@ public class PlayerView extends GameEntityView {
}
public FCollectionView<PlayerView> getOpponents() {
return MoreObjects.firstNonNull(this.<FCollectionView<PlayerView>>get(TrackableProperty.Opponents), new FCollection<PlayerView>());
return Objects.firstNonNull(this.<FCollectionView<PlayerView>>get(TrackableProperty.Opponents), new FCollection<PlayerView>());
}
void updateOpponents(Player p) {
set(TrackableProperty.Opponents, PlayerView.getCollection(p.getOpponents()));