From 759c05470e33cc25ced5b47aa181f1ca79181ac8 Mon Sep 17 00:00:00 2001
From: Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org>
Date: Wed, 29 Nov 2017 03:50:59 +0100
Subject: Adds owners to caches items, allowing for pings.

---
 src/query/character_turn.erl | 26 +++++++++++++++++++++++---
 src/query/load_state.erl     | 12 +++++++++---
 2 files changed, 32 insertions(+), 6 deletions(-)

(limited to 'src/query')

diff --git a/src/query/character_turn.erl b/src/query/character_turn.erl
index f406efd..d6d68e1 100644
--- a/src/query/character_turn.erl
+++ b/src/query/character_turn.erl
@@ -58,14 +58,27 @@ parse_input (Req) ->
    }.
 
 fetch_data (Input) ->
-   Battlemap = timed_cache:fetch(battlemap_db, Input#input.battlemap_id),
+   Battlemap =
+      timed_cache:fetch
+      (
+         battlemap_db,
+         Input#input.player_id,
+         Input#input.battlemap_id
+      ),
    BattlemapInst =
       timed_cache:fetch
       (
          battlemap_instance_db,
+         Input#input.player_id,
          <<"0">>
       ),
-   MainChar = timed_cache:fetch(character_db, Input#input.char_id),
+   MainChar =
+      timed_cache:fetch
+      (
+         character_db,
+         Input#input.player_id,
+         Input#input.char_id
+      ),
    MainCharInst =
       battlemap_instance:get_char_instance
       (
@@ -78,7 +91,13 @@ fetch_data (Input) ->
          TargetCharInst = nothing;
 
       TargetID ->
-         TargetChar = timed_cache:fetch(character_db, TargetID),
+         TargetChar =
+            timed_cache:fetch
+            (
+               character_db,
+               Input#input.player_id,
+               TargetID
+            ),
          TargetCharInst =
             battlemap_instance:get_char_instance
             (
@@ -182,6 +201,7 @@ handle (Req) ->
    (
       battlemap_instance_db,
       <<"0">>,
+      Input#input.player_id,
       NQueryState#query_state.battlemap_inst
    ),
    %%%% Reply
diff --git a/src/query/load_state.erl b/src/query/load_state.erl
index 9c28d2f..04e633e 100644
--- a/src/query/load_state.erl
+++ b/src/query/load_state.erl
@@ -109,20 +109,26 @@ handle (Req) ->
    %%%% Parse
    Input = parse_input(Req),
    %%%% Fetch
-   Battlemap = timed_cache:fetch(battlemap_db, Input#input.battlemap_id),
+   Battlemap =
+      timed_cache:fetch
+      (
+         battlemap_db,
+         Input#input.player_id,
+         Input#input.battlemap_id
+      ),
    BattlemapInstance =
       timed_cache:fetch
       (
          battlemap_instance_db,
+         Input#input.player_id,
          <<"0">>
-%         {Input#input.battlemap_id, Input#input.battlemap_instance_id}
       ),
    Characters =
       lists:map
       (
          fun ({CharID, CharInst}) ->
             {
-               timed_cache:fetch(character_db, CharID),
+               timed_cache:fetch(character_db, Input#input.player_id, CharID),
                CharInst
             }
          end,
-- 
cgit v1.2.3-70-g09d2