summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/player')
-rw-r--r--src/player/query/plr_load.erl5
-rw-r--r--src/player/reply/plr_set_player.erl8
2 files changed, 7 insertions, 6 deletions
diff --git a/src/player/query/plr_load.erl b/src/player/query/plr_load.erl
index c73c6bd..278f568 100644
--- a/src/player/query/plr_load.erl
+++ b/src/player/query/plr_load.erl
@@ -73,10 +73,11 @@ fetch_data (Input) ->
-spec generate_reply(query_state(), input()) -> binary().
-generate_reply (QueryState, _Input) ->
+generate_reply (QueryState, Input) ->
Player = QueryState#query_state.player,
+ PlayerID = Input#input.target_id,
- Output = jiffy:encode([plr_set_player:generate(Player)]),
+ Output = jiffy:encode([plr_set_player:generate(PlayerID, Player)]),
Output.
diff --git a/src/player/reply/plr_set_player.erl b/src/player/reply/plr_set_player.erl
index de54fc0..2a4b7f6 100644
--- a/src/player/reply/plr_set_player.erl
+++ b/src/player/reply/plr_set_player.erl
@@ -7,7 +7,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% EXPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--export([generate/1]).
+-export([generate/2]).
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -16,8 +16,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--spec generate (shr_player:type()) -> {list(any())}.
-generate (Player) ->
+-spec generate (shr_player:id(), shr_player:type()) -> {list(any())}.
+generate (PlayerID, Player) ->
MapList =
lists:map
(
@@ -49,7 +49,7 @@ generate (Player) ->
{
[
{<<"msg">>, <<"set_plr">>},
- {<<"id">>, shr_player:get_id(Player)},
+ {<<"id">>, PlayerID},
{<<"nme">>, shr_player:get_username(Player)},
{<<"maps">>, MapList},
{<<"cmps">>, CampaignList},