[MIRROR] makes verb callbacks not execute if the original client disc…

…onnected [MDB IGNORE] (#861) * makes verb callbacks not execute if the original client disconnected (#79964) --------- Co-authored-by: SkyratBot <[email protected]> Co-authored-by: Kylerace <[email protected]> Co-authored-by: san7890 <the@ san7890.com>
Fluffy-Frontier · Nov 28, 2023 · 186ff92 · 186ff92
1 parent 1d0200e
commit 186ff92
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/code/controllers/subsystem/verb_manager.dm b/code/controllers/subsystem/verb_manager.dm
@@ -83,13 +83,15 @@ SUBSYSTEM_DEF(verb_manager)
 		incoming_callback.user = WEAKREF(incoming_callback.object)
 		var/datum/callback/new_us = CALLBACK(arglist(list(GLOBAL_PROC, GLOBAL_PROC_REF(_queue_verb)) + args.Copy()))
 		return world.push_usr(incoming_callback.object, new_us)
-#endif
 
-	//debatable whether this is needed, this is just to try and ensure that you dont use this to queue stuff that isnt from player input.
-	if(QDELETED(usr))
+#else
+
+	if(QDELETED(usr) || isnull(usr.client))
 		stack_trace("_queue_verb() returned false because it wasnt called from player input!")
 		return FALSE
 
+#endif
+
 	if(!istype(subsystem_to_use))
 		stack_trace("_queue_verb() returned false because it was given an invalid subsystem to queue for!")
 		return FALSE

diff --git a/code/datums/verb_callbacks.dm b/code/datums/verb_callbacks.dm
@@ -1,8 +1,29 @@
 ///like normal callbacks but they also record their creation time for measurement purposes
+///they also require the same usr/user that made the callback to both still exist and to still have a client in order to execute
 /datum/callback/verb_callback
 	///the tick this callback datum was created in. used for testing latency
 	var/creation_time = 0
 
 /datum/callback/verb_callback/New(thingtocall, proctocall, ...)
 	creation_time = DS2TICKS(world.time)
 	. = ..()
+
+#ifndef UNIT_TESTS
+/datum/callback/verb_callback/Invoke(...)
+	var/mob/our_user = user?.resolve()
+	if(QDELETED(our_user) || isnull(our_user.client))
+		return
+	var/mob/temp = usr
+	. = ..()
+	usr = temp
+
+/datum/callback/verb_callback/InvokeAsync(...)
+	var/mob/our_user = user?.resolve()
+	if(QDELETED(our_user) || isnull(our_user.client))
+		return
+	var/mob/temp = usr
+	. = ..()
+	usr = temp
+#endif
+
+