cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 16:47:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Openspace Item Handler doesn't think stuff in bags are valid (#83973)

Browse Source 
## About The Pull Request

Fixes #83972 

Clicking on stuff in your bag with stuff that has
`openspace_item_click_handler` makes it think you're on a different z
level (which is technically true) so it overrides the click and does its
own thing.

So we check that z is not 0. Also move the return to be safe. 


## Changelog

🆑 Melbert
fix: Fix inability to make r-glass by hand inside your backpack
/🆑

---------

Co-authored-by: san7890 <the@san7890.com>
This commit is contained in:
MrMelbert
2024-06-14 21:14:02 -06:00
committed by GitHub
co-authored by san7890
parent f1af7d9b1b
commit aaaf761adc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/elements/openspace_item_click_handler.dm
+3 -3
View File
@@ -17,13 +17,13 @@
//Invokes the proctype with a turf above as target.
/datum/element/openspace_item_click_handler/proc/divert_interaction(obj/item/source, mob/user, atom/target, click_parameters)
SIGNAL_HANDLER
if(target.z == user.z)
if((target.z == 0) || (user.z == 0) || target.z == user.z)
return NONE
var/turf/checked_turf = get_turf(target)
while(!isnull(checked_turf))
checked_turf = GET_TURF_ABOVE(checked_turf)
if(checked_turf?.z == user.z && user.CanReach(checked_turf, source))
INVOKE_ASYNC(source, TYPE_PROC_REF(/obj/item, handle_openspace_click), checked_turf, user, click_parameters)
break
return ITEM_INTERACT_BLOCKING
return ITEM_INTERACT_BLOCKING
return NONE