From 5b3279a2cb16babf10584f4c83fe0aa552bdc236 Mon Sep 17 00:00:00 2001 From: Kyle Spier-Swenson Date: Tue, 8 Sep 2020 11:29:54 -0700 Subject: [PATCH] Fix spacemandmm erroring if a proc had both should_not_sleep and set waitfor See https://github.com/tgstation/tgstation/pull/53553#discussion_r485090104 for why this logic is invalid. --- src/dreamchecker/lib.rs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/dreamchecker/lib.rs b/src/dreamchecker/lib.rs index 3bdaf3a8e..443e0e70c 100644 --- a/src/dreamchecker/lib.rs +++ b/src/dreamchecker/lib.rs @@ -632,13 +632,6 @@ impl<'o> AnalyzeObjectTree<'o> { pub fn check_proc_call_tree(&mut self) { for (procref, &(_, location)) in self.must_not_sleep.directive.iter() { - if let Some(_) = self.waitfor_procs.get(&procref) { - error(procref.get().location, format!("{} sets SpacemanDMM_should_not_sleep but also sets waitfor = 0", procref)) - .with_note(location, "SpacemanDMM_should_not_sleep set here") - .with_errortype("must_not_sleep") - .register(self.context); - continue - } if let Some(sleepvec) = self.sleeping_procs.get_violators(*procref) { error(procref.get().location, format!("{} sets SpacemanDMM_should_not_sleep but calls blocking built-in(s)", procref)) .with_note(location, "SpacemanDMM_should_not_sleep set here")