Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Forge Core Developers
Forge
Commits
1cf40f45
Commit
1cf40f45
authored
Feb 08, 2018
by
Seravy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Fixes compile/run bugs in IntelliJ"
This reverts commit
36917c0d
parent
a5d71ff8
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
7 additions
and
8 deletions
+7
-8
forge-core/pom.xml
forge-core/pom.xml
+1
-1
forge-game/src/main/java/forge/game/player/PlayerView.java
forge-game/src/main/java/forge/game/player/PlayerView.java
+1
-2
forge-gui-android/pom.xml
forge-gui-android/pom.xml
+1
-1
forge-gui-desktop/pom.xml
forge-gui-desktop/pom.xml
+1
-1
forge-gui-desktop/src/main/java/forge/view/Main.java
forge-gui-desktop/src/main/java/forge/view/Main.java
+1
-1
forge-gui-mobile/pom.xml
forge-gui-mobile/pom.xml
+1
-1
forge-gui/pom.xml
forge-gui/pom.xml
+1
-1
No files found.
forge-core/pom.xml
View file @
1cf40f45
...
...
@@ -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>
...
...
forge-game/src/main/java/forge/game/player/PlayerView.java
View file @
1cf40f45
...
...
@@ -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
More
Objects
.
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
()));
...
...
forge-gui-android/pom.xml
View file @
1cf40f45
...
...
@@ -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>
...
...
forge-gui-desktop/pom.xml
View file @
1cf40f45
...
...
@@ -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>
...
...
forge-gui-desktop/src/main/java/forge/view/Main.java
View file @
1cf40f45
...
...
@@ -54,7 +54,7 @@ public final class Main {
// command line startup here
String
mode
=
args
[
0
].
toLowerCase
();
switch
(
mode
)
{
case
"sim"
:
SimulateMatch
.
simulate
(
args
);
...
...
forge-gui-mobile/pom.xml
View file @
1cf40f45
...
...
@@ -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>
...
...
forge-gui/pom.xml
View file @
1cf40f45
...
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment