Fixed moving away from delve, fixed map movement/exploration timer

Author: AdamKyle

app/Game/Maps/Controllers/Api/MapController.php

@@ -4,6 +4,7 @@
 
 use App\Flare\Models\Character;
 use App\Flare\Models\Quest;
+use App\Flare\Values\AutomationType;
 use App\Game\Maps\Requests\MoveRequest;
 use App\Game\Maps\Requests\QuestDataRequest;
 use App\Game\Maps\Requests\SetSailValidation;
@@ -62,6 +63,19 @@ public function move(MoveRequest $request, Character $character): JsonResponse
             return response()->json(['invalid input'], 429);
         }
 
+        if ($character->currentAutomations()
+                ->where('character_id', $character->id)
+                ->where('completed_at', '>', now())
+                ->where(function ($query) {
+                    $query->where('type', AutomationType::DELVE);
+                })
+                ->exists()
+        ) {
+            return response()->json([
+                'message' => 'You cannot escape the shadows child. Cancel the Delve if you want to wonder around in the wild.',
+            ], 422);
+        }
+
         $this->walkingService->setCoordinatesToTravelTo(
             $request->character_position_x,
             $request->character_position_y

resources/js/game/sections/map/lib/state/map-state-manager.ts

@@ -21,7 +21,7 @@ export default class MapStateManager {
         component: MapSection | Game,
     ): MapState {
         let state: MapState = {
-            ...this.setState(data),
+            ...this.setState(data, (component as any).state),
             ...{ map_id: data.character_map.game_map.id },
         };
 
@@ -84,7 +84,7 @@ export default class MapStateManager {
      */
     static buildCoreState(data: MapData, component: Game): MapState {
         let state: MapState = {
-            ...this.setState(data),
+            ...this.setState(data, (component as any).state),
             ...{ map_id: data.character_map.game_map.id },
         };
 
@@ -122,7 +122,10 @@ export default class MapStateManager {
      *
      * @param data
      */
-    static setState(data: MapData): MapState {
+    static setState(
+        data: MapData,
+        previousState?: Partial<MapState>,
+    ): MapState {
         return {
             map_id: data.character_map.id,
             map_url: data.map_url,
@@ -149,8 +152,14 @@ export default class MapStateManager {
             bottom_bounds: 0,
             right_bounds: 0,
             loading: false,
-            automation_time_out: 0,
-            celestial_time_out: 0,
+            automation_time_out:
+                (data as any).automation_time_out ??
+                previousState?.automation_time_out ??
+                0,
+            celestial_time_out:
+                (data as any).celestial_time_out ??
+                previousState?.celestial_time_out ??
+                0,
             is_event_based: data.is_event_based,
             can_access_hell_forged_shop: data.can_access_hell_forged_shop,
             can_access_purgatory_chains_shop: