@@ -335,7 +335,7 @@ public void addPregnancy(final Campaign campaign, final LocalDate today, final P
335
335
* @param isNoReport true if no message should be posted to the daily report
336
336
*/
337
337
public void addPregnancy (final Campaign campaign , final LocalDate today , final Person mother , final int size ,
338
- boolean isNoReport ) {
338
+ boolean isNoReport ) {
339
339
if (size < 1 ) {
340
340
return ;
341
341
}
@@ -506,7 +506,7 @@ public void birth(final Campaign campaign, final LocalDate today, final Person m
506
506
* @param father the father of the baby, null if unknown
507
507
*/
508
508
private static void logAndUpdateFamily (Campaign campaign , LocalDate today , Person mother , Person baby ,
509
- Person father ) {
509
+ Person father ) {
510
510
if (campaign .getCampaignOptions ().isLogProcreation ()) {
511
511
MedicalLogger .deliveredBaby (mother , baby , today );
512
512
if (father != null ) {
@@ -537,7 +537,7 @@ private static void logAndUpdateFamily(Campaign campaign, LocalDate today, Perso
537
537
* @return the babies
538
538
*/
539
539
public List <Person > birthHistoric (final Campaign campaign , final LocalDate today , final Person mother ,
540
- @ Nullable final Person father ) {
540
+ @ Nullable final Person father ) {
541
541
List <Person > babies = new ArrayList <>();
542
542
543
543
// Determine the number of children
@@ -668,7 +668,7 @@ public void processNewWeek(final Campaign campaign, final LocalDate today, final
668
668
}
669
669
670
670
if (campaign .getCampaignOptions ().isUseMaternityLeave ()) {
671
- if (person .getStatus (). isActive () && (person .getDueDate ().minusWeeks (20 ).isBefore (today ))) {
671
+ if (! person .isBusy () && (person .getDueDate ().minusWeeks (20 ).isBefore (today ))) {
672
672
person .changeStatus (campaign , today , PersonnelStatus .ON_MATERNITY_LEAVE );
673
673
}
674
674
}
@@ -690,7 +690,7 @@ public void processNewWeek(final Campaign campaign, final LocalDate today, final
690
690
* @param isNoReport true, if the player shouldn't be informed, otherwise false
691
691
*/
692
692
public void processRandomProcreationCheck (final Campaign campaign , final LocalDate today , final Person person ,
693
- boolean isNoReport ) {
693
+ boolean isNoReport ) {
694
694
if (randomlyProcreates (today , person )) {
695
695
addPregnancy (campaign , today , person , isNoReport );
696
696
}
0 commit comments