Skip to content

Commit be5c670

Browse files
committed
remove observer check for enemies, readd in 4.3.0
1 parent 6876cd2 commit be5c670

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/main/java/bwapi/Game.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -931,13 +931,15 @@ public Set<Player> allies() {
931931
.collect(Collectors.toSet());
932932
}
933933

934+
//TODO FIX in 4.3.0
934935
public Set<Player> enemies() {
935936
final Player self = self();
936937
return getPlayers().stream()
937-
.filter(p -> !(p.isObserver() || p.isNeutral() || self.isAlly(p)))
938+
.filter(p -> !(p.isNeutral() || self.isAlly(p)))
938939
.collect(Collectors.toSet());
939940
}
940941

942+
//TODO FIX in 4.3.0
941943
public Set<Player> observers() {
942944
return getPlayers().stream()
943945
.filter(Player::isObserver)

src/main/java/bwapi/Player.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,9 @@ public boolean isAlly(final Player player) {
5454
return getForce().equals(player.getForce());
5555
}
5656

57+
//TODO FIX in 4.3.0
5758
public boolean isEnemy(final Player player) {
58-
return !(player.isObserver() || player.isNeutral() || isAlly(player));
59+
return !(player.isNeutral() || isAlly(player));
5960
}
6061

6162
public boolean isNeutral() {

0 commit comments

Comments
 (0)