Skip to content

Commit 7ce225b

Browse files
committed
fix neutralunits not getting added as neutral is not yet initialised, fix by inverting initialisation order
1 parent 003c4b7 commit 7ce225b

File tree

1 file changed

+20
-22
lines changed

1 file changed

+20
-22
lines changed

src/main/java/bwapi/Game.java

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,26 @@ void init() {
170170

171171
units = new Unit[10000];
172172

173+
randomSeed = gameData.getRandomSeed();
174+
175+
revision = gameData.getRevision();
176+
debug = gameData.isDebug();
177+
self = players[gameData.getSelf()];
178+
enemy = players[gameData.getEnemy()];
179+
neutral = players[gameData.getNeutral()];
180+
replay = gameData.isReplay();
181+
multiplayer = gameData.isMultiplayer();
182+
battleNet = gameData.isBattleNet();
183+
startLocations = IntStream.range(0, gameData.getStartLocationCount())
184+
.mapToObj(i -> new TilePosition(gameData.getStartLocations(i)))
185+
.collect(Collectors.collectingAndThen(Collectors.toList(), Collections::unmodifiableList));
186+
mapWidth = gameData.getMapWidth();
187+
mapHeight = gameData.getMapHeight();
188+
mapFileName = gameData.getMapFileName();
189+
mapPathName = gameData.getMapPathName();
190+
mapName = gameData.getMapName();
191+
mapHash = gameData.getMapHash();
192+
173193
final List<Unit> staticMinerals = new ArrayList<>();
174194
final List<Unit> staticGeysers = new ArrayList<>();
175195
final List<Unit> staticNeutralUnits = new ArrayList<>();
@@ -199,28 +219,6 @@ void init() {
199219
this.staticNeutralUnits = Collections.unmodifiableList(staticNeutralUnits);
200220
this.allUnits = Collections.unmodifiableList(allUnits);
201221

202-
203-
204-
randomSeed = gameData.getRandomSeed();
205-
206-
revision = gameData.getRevision();
207-
debug = gameData.isDebug();
208-
self = players[gameData.getSelf()];
209-
enemy = players[gameData.getEnemy()];
210-
neutral = players[gameData.getNeutral()];
211-
replay = gameData.isReplay();
212-
multiplayer = gameData.isMultiplayer();
213-
battleNet = gameData.isBattleNet();
214-
startLocations = IntStream.range(0, gameData.getStartLocationCount())
215-
.mapToObj(i -> new TilePosition(gameData.getStartLocations(i)))
216-
.collect(Collectors.collectingAndThen(Collectors.toList(), Collections::unmodifiableList));
217-
mapWidth = gameData.getMapWidth();
218-
mapHeight = gameData.getMapHeight();
219-
mapFileName = gameData.getMapFileName();
220-
mapPathName = gameData.getMapPathName();
221-
mapName = gameData.getMapName();
222-
mapHash = gameData.getMapHash();
223-
224222
buildable = new boolean[mapWidth][mapHeight];
225223
groundHeight = new int[mapWidth][mapHeight];
226224
mapTileRegionID = new short[mapWidth][mapHeight];

0 commit comments

Comments
 (0)