Merge pull request #10853 from Ghommie/Ghommie-cit549

A PR about runtime errors
2020-02-04 03:20:34 -07:00
parent c458c243a7 fedb05b3be
commit 97583bd98f
6 changed files with 21 additions and 22 deletions
@@ -1983,8 +1983,8 @@
 		var/atom/movable/AM = locate(href_list["adminplayerobservefollow"])

 		var/client/C = usr.client
-		if(!isobserver(usr))
-			C.admin_ghost()
+		if(!isobserver(usr) && !C.admin_ghost())
+			return
 		var/mob/dead/observer/A = C.mob
 		A.ManualFollow(AM)

@@ -2006,8 +2006,8 @@
 		var/z = text2num(href_list["Z"])

 		var/client/C = usr.client
-		if(!isobserver(usr))
-			C.admin_ghost()
+		if(!isobserver(usr) && !C.admin_ghost())
+			return
 		sleep(2)
 		C.jumptocoord(x,y,z)