Skip to content

Fixing potential error if addShips returns null #543

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

Merged
AnotherCommander merged 1 commit into from
Jan 23, 2026
Merged

Fixing potential error if addShips returns null #543

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
38 changes: 21 additions & 17 deletions Resources/Scripts/oolite-populator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1655,21 +1655,6 @@ this._addHunterPack = function(pos,home,dest,role,returning)
var group = new ShipGroup("hunter group",t[0]);
t[0].group = group;

var hs = this._addShips("hunter",1+Math.floor(Math.random()*4)+Math.floor(Math.random()*4),pos,3E3);
for (var i = 0; i<hs.length; i++)
{
hs[i].group = group;
group.addShip(hs[i]);
hs[i].bounty = 0;
hs[i].fuel = 7;
hs[i].homeSystem = t[0].homeSystem;
hs[i].destinationSystem = t[0].destinationSystem;
this._setWeapons(hs[i],1.5); // mixed weapons
if (returning)
{
this._setMissiles(hs[i],-1);
}
}
if (role == "hunter-heavy")
{
// occasionally give heavy hunters aft lasers
Expand All @@ -1687,6 +1672,23 @@ this._addHunterPack = function(pos,home,dest,role,returning)
// auto AI will normally get this already but not if the hunter
// addition used fallback roles
}

var hs = this._addShips("hunter",1+Math.floor(Math.random()*4)+Math.floor(Math.random()*4),pos,3E3);
if (!hs) return;
for (var i = 0; i<hs.length; i++)
{
hs[i].group = group;
group.addShip(hs[i]);
hs[i].bounty = 0;
hs[i].fuel = 7;
hs[i].homeSystem = t[0].homeSystem;
hs[i].destinationSystem = t[0].destinationSystem;
this._setWeapons(hs[i],1.5); // mixed weapons
if (returning)
{
this._setMissiles(hs[i],-1);
}
}
}
}

Expand Down Expand Up @@ -2393,8 +2395,10 @@ this._addGroup = function(role,num,pos,spread)
for (var i = 0 ; i < num ; i++)
{
var ship = pos.launchShipWithRole(role);
ship.group = group;
group.addShip(ship);
if (ship) {
ship.group = group;
group.addShip(ship);
}
}
return group;
}
Expand Down