Fix threader deadlock regression

Wait calls were causing deadlocks due to a blocked updatescript.
Unfortunately, the workaround implemented here means any wait calls will
lock up the map engine until they complete.  This will have to fixed
properly in the future, but for now it'll have to do.