From ca8e56c15a26bc5f3d1dffe5fd39e1ca4b82d6f8 Mon Sep 17 00:00:00 2001 From: est31 Date: Tue, 27 Oct 2015 21:03:59 +0100 Subject: Environment: Time of day fixes and add serverside getter -> Put access to time variables under the time lock. -> Merge both time locks, there is no point to have two locks. -> Fix the lock being released too early in Environment::setTimeOfDay -> Add serverside getter so that you don't have to get the environment if you only have the server --- src/server.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/server.cpp') diff --git a/src/server.cpp b/src/server.cpp index 3aff2fb97..1e039631c 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -1249,6 +1249,11 @@ void Server::setTimeOfDay(u32 time) m_time_of_day_send_timer = 0; } +u32 Server::getTimeOfDay() +{ + return m_env->getTimeOfDay(); +} + void Server::onMapEditEvent(MapEditEvent *event) { if(m_ignore_map_edit_events) -- cgit v1.2.3