oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: Correctly get inventory objects registered in other rooms (#608)

Browse Source
This commit is contained in:
Matteo Piovanelli
2022-07-14 17:21:24 +02:00
committed by GitHub
parent 2a85e04f33
commit 324ef5f5e6
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
addons/escoria-core/game/core-scripts/esc/esc_object_manager.gd
View File

@@ -296,6 +296,17 @@ func get_object(global_id: String, room: ESCRoom = null) -> ESCObject:
"Object with global id %s in room instance (%s, %s) not found."
% [global_id, room_key.room_global_id, room_key.room_instance_id]
)
if escoria.inventory_manager.inventory_has(global_id):
# item is in the inventory and may be registered to a different room
for single_room in room_objects:
# these are arrays of the objects still registered for each room
if single_room.objects.has(global_id):
escoria.logger.info(
self,
"Object with global id %s found in room instance (%s, %s) through the inventory."
% [global_id, room_key.room_global_id, room_key.room_instance_id]
)
return single_room.objects[global_id]
return null