diff options
author | est31 <MTest31@outlook.com> | 2015-10-27 21:03:59 +0100 |
---|---|---|
committer | est31 <MTest31@outlook.com> | 2015-10-27 23:19:17 +0100 |
commit | ca8e56c15a26bc5f3d1dffe5fd39e1ca4b82d6f8 (patch) | |
tree | cc5d8627278d725f630e9df99b14a6b5964b4543 /src/server.cpp | |
parent | c406438b95e3df181961add56a2511b96bd9d690 (diff) | |
download | hax-minetest-server-ca8e56c15a26bc5f3d1dffe5fd39e1ca4b82d6f8.tar.gz hax-minetest-server-ca8e56c15a26bc5f3d1dffe5fd39e1ca4b82d6f8.zip |
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
Diffstat (limited to 'src/server.cpp')
-rw-r--r-- | src/server.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
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) |