Skip to content
This repository has been archived by the owner on Nov 24, 2021. It is now read-only.

Resolves #268 #321

Closed
wants to merge 1 commit into from
Closed

Resolves #268 #321

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
9 changes: 4 additions & 5 deletions includes/classes/class.FleetFunctions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,11 +342,10 @@ public static function SendFleetBack($USER, $FleetID)
}
}

if($fleetResult['fleet_mission'] == 5){
$fleetEndTime = ($fleetResult['fleet_start_time'] - $fleetResult['start_time']) + TIMESTAMP;
}else{
$fleetEndTime = (TIMESTAMP - $fleetResult['start_time']) + TIMESTAMP;
}
$returnTimes = array(TIMESTAMP - $fleetResult['start_time'],
$fleetResult['fleet_start_time'] - $fleetResult['start_time']);

$fleetEndTime = TIMESTAMP + min($returnTimes);

$sql = 'UPDATE %%FLEETS%%, %%FLEETS_EVENT%% SET
fleet_group = :fleetGroup,
Expand Down