Merge branch 'fixes' into 'pregmod-master'

Added better guards to Pit fight casting

Closes #4167

See merge request !10976

src/events/scheduled/pitFight.js

@@ -77,6 +77,7 @@ App.Events.SEPitFight = class SEPitFight extends App.Events.BaseEvent {
 			}
 
 			function getAnimalFight() {
+				if (!V.active.canine && !V.active.hooved && !V.active.feline) { return getSlavesFight(); }
 				const fighter = available.pluck();
 				V.pit.slaveFightingAnimal = fighter;
 
@@ -84,6 +85,7 @@ App.Events.SEPitFight = class SEPitFight extends App.Events.BaseEvent {
 			}
 
 			function getBodyguardFight() {
+				if (!S.Bodyguard) { return getSlavesFight(); }
 				if (available.includes(S.Bodyguard.ID)) {
 					available.delete(S.Bodyguard.ID);
 				}