Additional fixes

Author: AdamKyle

app/Flare/Services/BuildMonsterCacheService.php

@@ -214,6 +214,7 @@ private function manageMonsters(array $monstersCache): array
                 ->where('game_map_id', $location->game_map_id)
                 ->where('is_raid_monster', false)
                 ->where('is_raid_boss', false)
+                ->whereNull('only_for_location_type')
                 ->get();
 
             $monsters = $this->transformMonsterForLocation(

app/Game/BattleRewardProcessing/Services/BattleRewardService.php

@@ -228,6 +228,8 @@ private function handleFactionLoyaltyBounty(): void {
 
             $this->character = $this->character->refresh();
 
+            event(new FactionLoyaltyUpdate($this->character->user, $this->factionLoyaltyService->getLoyaltyInfoForPlane($this->character)));
+
             return;
         }
 

app/Game/Exploration/Controllers/Api/DelveExplorationController.php

@@ -29,9 +29,12 @@ public function begin(DelveExplorationRequest $request, Character $character): J
         }
 
         if ($character->currentAutomations()
-                ->where('type', AutomationType::DELVE)
-                ->orWhere('type', AutomationType::EXPLORING)
                 ->where('character_id', $character->id)
+                ->where('completed_at', '>', now())
+                ->where(function ($query) {
+                    $query->where('type', AutomationType::DELVE)
+                        ->orWhere('type', AutomationType::EXPLORING);
+                })
                 ->count() > 0
         ) {
             return response()->json([

app/Game/Exploration/Controllers/Api/ExplorationController.php

@@ -30,7 +30,14 @@ public function begin(ExplorationRequest $request, Character $character): JsonRe
             ], 422);
         }
 
-        if ($character->currentAutomations()->where('type', AutomationType::DELVE)->orWhere('type', AutomationType::EXPLORING)->count() > 0) {
+        if ($character->currentAutomations()
+                ->where('character_id', $character->id)
+                ->where('completed_at', '>', now())
+                ->where(function ($query) {
+                    $query->where('type', AutomationType::DELVE)
+                        ->orWhere('type', AutomationType::EXPLORING);
+                })
+                ->count() > 0) {
             return response()->json([
                 'message' => 'Nope. You already have one in progress.',
             ], 422);

app/Game/Exploration/Jobs/DelveExploration.php

@@ -486,6 +486,10 @@ private function endAutomation(?CharacterAutomation $automation, ?DelveExplorati
 
             $this->rewardPlayer($character, $delveExploration->refresh());
         }
+
+        if (is_null($delveExploration) || is_null($automation)) {
+            $this->character->currentAutomations()->delete();
+        }
     }
 
     /**

app/Game/Exploration/Jobs/Exploration.php

@@ -405,7 +405,11 @@ private function endAutomation(?CharacterAutomation $automation, CharacterCacheD
             event(new UpdateCharacterStatus($character));
 
             event(new ExplorationTimeOut($character->user, 0));
+
+            return;
         }
+
+        $this->character->currentAutomations()->delete();
     }
 
     /**

app/Game/Kingdoms/Handlers/CapitalCityHandlers/CapitalCityRequestResourcesHandler.php

@@ -61,7 +61,7 @@ public function handleResourceRequests(
             ]);
 
             $requestData = $this->markRequestsAsRejected($requestData);
-            $this->messages[] = 'Resource Request Rejected: No kingdom could be found to request the resources for these buildings.';
+            $this->messages[] = 'Resource Request Rejected: No kingdom could be found to request the resources for these rquests.';
 
             $queue = $this->updateQueueData($queue, $requestData, CapitalCityQueueStatus::REJECTED);
 

app/Game/Maps/Services/Common/UpdateRaidMonstersForLocation.php

@@ -46,6 +46,7 @@ public function updateMonstersList(Character $character, ?Location $location = n
 
         if (! is_null($location)) {
             if (! is_null($location->enemy_strength_type)) {
+
                 $locationMonsters = Cache::get('monsters')[$location->name];
 
                 if (! $hasAccessToPurgatory && ! is_null($character->map->gameMap->only_during_event_type)) {