fix isParticipating/observer related bug(s)

Author: JasperGeurtz

README.md

@@ -1,6 +1,6 @@
 [![Build Status](https://travis-ci.org/JavaBWAPI/JBWAPI.svg?branch=develop)](https://travis-ci.org/JavaBWAPI/JBWAPI)[![Total alerts](https://img.shields.io/lgtm/alerts/g/JavaBWAPI/JBWAPI.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/JavaBWAPI/JBWAPI/alerts/)[![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/JavaBWAPI/JBWAPI.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/JavaBWAPI/JBWAPI/context:java)
 # JBWAPI
-Pure Java [bwapi](https://github.com/bwapi/bwapi) client (4.2.0 & 4.4.0) implementation backed by [N00byEdge](https://github.com/N00byEdge)'s [JavaBWAPIBackend](https://github.com/N00byEdge/JavaBWAPIBackend) idea and automated by [Bytekeeper](https://github.com/Bytekeeper).
+Pure Java [bwapi](https://github.com/bwapi/bwapi) 4.4.0 client implementation backed by [N00byEdge](https://github.com/N00byEdge)'s [JavaBWAPIBackend](https://github.com/N00byEdge/JavaBWAPIBackend) idea and automated by [Bytekeeper](https://github.com/Bytekeeper).
 
 Also contains the pure Java BWEM implementation from [BWAPI4J](https://github.com/OpenBW/BWAPI4J).
 
@@ -36,7 +36,7 @@ Add JBWAPI as a dependecy
 <dependency>
     <groupId>com.github.JavaBWAPI</groupId>
     <artifactId>JBWAPI</artifactId>
-    <version>0.6</version>
+    <version>0.7</version>
 </dependency>
 ```
 
@@ -54,7 +54,7 @@ allprojects {
 Add JBWAPI as a dependecy
 ```
 dependencies {
-    implementation 'com.github.JavaBWAPI:JBWAPI:0.6'
+    implementation 'com.github.JavaBWAPI:JBWAPI:0.7'
 }
 ```
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>jbwapi</groupId>
     <artifactId>jbwapi</artifactId>
-    <version>0.6</version>
+    <version>0.7</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/bwapi/Client.java

@@ -44,7 +44,7 @@ class Client {
             + 4 // IsConnected
             + 4 // LastKeepAliveTime
             ;
-    private static final List<Integer> SUPPORTED_BWAPI_VERSIONS = Arrays.asList(10002, 10003);
+    private static final List<Integer> SUPPORTED_BWAPI_VERSIONS = Arrays.asList(10003);
     private static final int MAX_COUNT = 19999;
 
     private static final int maxNumGames = 8;

src/main/java/bwapi/Game.java

@@ -56,6 +56,11 @@ public class Game {
     private List<Force> forceSet;
     private List<Player> playerSet;
     private List<Region> regionSet;
+
+    private List<Player> allies;
+    private List<Player> enemies;
+    private List<Player> observers;
+
     // CHANGING
     private Unit[] units;
 
@@ -189,6 +194,8 @@ void init() {
         this.staticNeutralUnits = Collections.unmodifiableList(staticNeutralUnits);
         this.allUnits = Collections.unmodifiableList(allUnits);
 
+
+
         randomSeed = gameData.getRandomSeed();
 
         revision = gameData.getRevision();
@@ -237,6 +244,15 @@ void init() {
 
         mapPixelWidth = mapWidth * TilePosition.SIZE_IN_PIXELS;
         mapPixelHeight = mapHeight * TilePosition.SIZE_IN_PIXELS;
+
+
+        enemies = playerSet.stream().filter(p -> !p.equals(self) && self.isEnemy(p))
+                .collect(Collectors.collectingAndThen(Collectors.toList(), Collections::unmodifiableList));
+        allies = playerSet.stream().filter(p -> !p.equals(self) && self.isAlly(p))
+                .collect(Collectors.collectingAndThen(Collectors.toList(), Collections::unmodifiableList));
+
+        observers = playerSet.stream().filter(p -> !p.equals(self) && p.isObserver())
+                .collect(Collectors.collectingAndThen(Collectors.toList(), Collections::unmodifiableList));
     }
 
     void unitCreate(final int id) {
@@ -1088,25 +1104,15 @@ public Player neutral() {
     }
 
     public List<Player> allies() {
-        final Player self = self();
-        return getPlayers().stream()
-                .filter(self::isAlly)
-                .collect(Collectors.toList());
+        return allies;
     }
 
-    //TODO FIX in 4.3.0
     public List<Player> enemies() {
-        final Player self = self();
-        return getPlayers().stream()
-                .filter(p -> !(p.isNeutral() || self.isAlly(p)))
-                .collect(Collectors.toList());
+        return enemies;
     }
 
-    //TODO FIX in 4.3.0
     public List<Player> observers() {
-        return getPlayers().stream()
-                .filter(Player::isObserver)
-                .collect(Collectors.toList());
+        return observers;
     }
 
     public void drawText(final CoordinateType ctype, final int x, final int y, final String cstr_format) {

src/main/java/bwapi/Player.java

@@ -57,15 +57,17 @@ public Force getForce() {
     }
 
     public boolean isAlly(final Player player) {
+        if (player == null || isNeutral() || player.isNeutral() || isObserver() || player.isObserver()) {
+            return false;
+        }
         return playerData.isAlly(player.getID());
     }
 
-    //TODO FIX OBSERVERS in 4.3.0
     public boolean isEnemy(final Player player) {
-        if (player.isNeutral()) {
+        if (player == null || isNeutral() || player.isNeutral() || isObserver() || player.isObserver()) {
             return false;
         }
-        return !isAlly(player);
+        return !playerData.isAlly(player.getID());
     }
 
     public boolean isNeutral() {