Merge pull request #10234 from Trevor159/raids-fix

raids plugin: fix rotation solver
This commit is contained in:
Adam
2019-11-13 13:52:07 -05:00
committed by GitHub
3 changed files with 30 additions and 1 deletions

View File

@@ -98,6 +98,25 @@ public class Raid
return combatRooms.toArray(new RaidRoom[0]);
}
void setCombatRooms(RaidRoom[] combatRooms)
{
int index = 0;
for (Room room : layout.getRooms())
{
if (room == null)
{
continue;
}
if (rooms[room.getPosition()].getType() == RoomType.COMBAT)
{
rooms[room.getPosition()] = combatRooms[index];
index++;
}
}
}
public String toCode()
{
StringBuilder builder = new StringBuilder();

View File

@@ -320,7 +320,9 @@ public class RaidsPlugin extends Plugin
}
raid.updateLayout(layout);
RotationSolver.solve(raid.getCombatRooms());
RaidRoom[] rooms = raid.getCombatRooms();
RotationSolver.solve(rooms);
raid.setCombatRooms(rooms);
overlay.setScoutOverlayShown(true);
if (config.layoutMessage())