adam/SCED
1
0
Fork 0
Code Actions Releases 8 Activity

Merge pull request #192 from argonui/pickup-fix

Browse Source 
Fix check for missing metadata in PlayArea onObjectPickup
This commit is contained in:
Chr1Z 2023-01-16 11:34:36 +01:00 committed by GitHub
commit 2e92953a24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/PlayArea.ttslua
View File

@ -140,7 +140,7 @@ function onObjectPickUp(player, object)
-- should be tracking -- should be tracking
if showLocationLinks() and isInPlayArea(object) and object.getGMNotes() ~= nil and object.getGMNotes() ~= "" then if showLocationLinks() and isInPlayArea(object) and object.getGMNotes() ~= nil and object.getGMNotes() ~= "" then
local pickedUpGuid = object.getGUID() local pickedUpGuid = object.getGUID()
local metadata = JSON.decode(object.getGMNotes()) local metadata = JSON.decode(object.getGMNotes()) or { }
if (metadata.type == "Location") then if (metadata.type == "Location") then
-- onCollisionExit sometimes comes 1 frame after onObjectPickUp (rather than before it or in -- onCollisionExit sometimes comes 1 frame after onObjectPickUp (rather than before it or in
-- the same frame). This causes a mismatch in the data between dragging the on-table, and -- the same frame). This causes a mismatch in the data between dragging the on-table, and