Commit 04809352 authored by Seravy's avatar Seravy

Revert "Fixes compile/run bugs in IntelliJ"

This reverts commit 36917c0d

(cherry picked from commit 1cf40f45)
parent a7e48e8a
......@@ -16,7 +16,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>23.0</version>
<version>16.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
......
......@@ -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()));
......
......@@ -81,7 +81,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>23.0</version>
<version>16.0.1</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
......
......@@ -190,7 +190,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>23.0</version>
<version>16.0.1</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
......
......@@ -54,7 +54,7 @@ public final class Main {
// command line startup here
String mode = args[0].toLowerCase();
switch(mode) {
case "sim":
SimulateMatch.simulate(args);
......
......@@ -48,7 +48,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>23.0</version>
<version>16.0.1</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
......
......@@ -39,7 +39,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>23.0</version>
<version>16.0.1</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment