Merge pull request #94 from jeffreykirchner/dev

summary data dev
jeffreykirchner · Sep 7, 2023 · ed6ce0b · ed6ce0b
2 parents 8726b56 + b4a77f9
commit ed6ce0b
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/main/consumers/staff/session_consumer_mixins/timer.py b/main/consumers/staff/session_consumer_mixins/timer.py
@@ -218,7 +218,7 @@ def sync_continue_timer(event, session_id):
                 avatar = world_state["avatars"][i]
                 #inventory
                 for k in main.globals.Goods.choices:                       
-                    sd_player["house_" + k[0]] = world_state["houses"][avatar["parameter_set_player_id"]][k[0]]
+                    sd_player["house_" + k[0]] = world_state["houses"][str(avatar["parameter_set_player_id"])][k[0]]
                     sd_player["avatar_" + k[0]] = avatar[k[0]]
 
             session.save()
@@ -287,9 +287,10 @@ def sync_continue_timer(event, session_id):
                     sd_player["start_health"] = world_state["avatars"][i]["health"]
 
                     #inventory
+                    avatar = world_state["avatars"][i]
                     for k in main.globals.Goods.choices:                       
-                        sd_player["house_" + k[0]] = world_state["houses"][i][k[0]]
-                        sd_player["avatar_" + k[0]] =  world_state["avatars"][i][k[0]]
+                        sd_player["house_" + k[0]] = world_state["houses"][str(avatar["parameter_set_player_id"])][k[0]]
+                        sd_player["avatar_" + k[0]] =  avatar[k[0]]
 
 
                 session = session.session_periods.get(id=last_period_id).do_consumption()