Skip to content

fix bug in hasPower fallback when no unittype is provided #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JasperGeurtz wants to merge 1 commit into
base: develop
Choose a base branch
from
+16 −1
Open

fix bug in hasPower fallback when no unittype is provided #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/bwapi/Game.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1033,7 +1033,7 @@ final public boolean hasPower(final int tileX, final int tileY, final UnitType u
if (unitType.id >= 0 && unitType.id < UnitType.None.id) {
return hasPowerPrecise(tileX * 32 + unitType.tileWidth() * 16, tileY * 32 + unitType.tileHeight() * 16, unitType);
}
return hasPowerPrecise(tileY * 32, tileY * 32, UnitType.None);
return hasPowerPrecise(tileX * 32, tileY * 32, UnitType.None);
}

final public boolean hasPower(final int tileX, final int tileY, final int tileWidth, final int tileHeight) {
Expand Down
15 changes: 15 additions & 0 deletions src/test/java/bwapi/GameTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,19 @@ public void ifReplaySelfAndEnemyShouldBeNull() throws IOException {
assertTrue(game.enemies().isEmpty());
assertTrue(game.allies().isEmpty());
}

@Test
public void hasPowerOnTile() throws IOException {
Game game = GameBuilder.createGame();
Unit pylon = mock(Unit.class);
given(pylon.getType()).willReturn(UnitType.Protoss_Pylon);
given(pylon.getPlayer()).willReturn(game.self());
given(pylon.exists()).willReturn(true);
given(pylon.isCompleted()).willReturn(true);
given(pylon.getPosition()).willReturn(new Position(1024, 512));
game.setAllUnits(Collections.singletonList(pylon));

// tile (31, 15) is pixel (992, 480), right next to the pylon
assertTrue(game.hasPower(31, 15));
}
}
Loading