Preliminary "active block" stuff + set up test code to grow grass.

[dragonfireclient.git] / src / server.cpp

diff --git a/src/server.cpp b/src/server.cpp
index d211186eb0cdcbdc2a55a9627b6e2156d8f7a9b4..84f9a28e08f6d761a9a9a19799e7524c2cbba6e8 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -30,6 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mineral.h"
 #include "config.h"
 #include "servercommand.h"
+#include "filesys.h"
 
 #define BLOCK_EMERGE_FLAG_FROMDISK (1<<0)
 
@@ -798,7 +799,7 @@ void RemoteClient::SendObjectData(
                        */
                        if(stepped_blocks.find(p) == NULL)
                        {
-                               block->stepObjects(dtime, true, server->getDayNightRatio());
+                               block->stepObjects(dtime, true, server->m_env.getDayNightRatio());
                                stepped_blocks.insert(p, true);
                                block->setChangedFlag();
                        }
@@ -968,7 +969,6 @@ Server::Server(
        m_con(PROTOCOL_ID, 512, CONNECTION_TIMEOUT, this),
        m_thread(this),
        m_emergethread(this),
-       m_time_of_day(9000),
        m_time_counter(0),
        m_time_of_day_send_timer(0),
        m_uptime(0),
@@ -987,10 +987,19 @@ Server::Server(
        m_con_mutex.Init();
        m_step_dtime_mutex.Init();
        m_step_dtime = 0.0;
-
+       
+       // Register us to receive map edit events
        m_env.getMap().addEventReceiver(this);
 
+       // If file exists, load environment metadata
+       if(fs::PathExists(m_mapsavedir+"/env_meta.txt"))
+       {
+               dstream<<"Server: Loading environment metadata"<<std::endl;
+               m_env.loadMeta(m_mapsavedir);
+       }
+
        // Load players
+       dstream<<"Server: Loading players"<<std::endl;
        m_env.deSerializePlayers(m_mapsavedir);
 }
 
@@ -1032,6 +1041,12 @@ Server::~Server()
        */
        dstream<<"Server: Saving players"<<std::endl;
        m_env.serializePlayers(m_mapsavedir);
+
+       /*
+               Save environment metadata
+       */
+       dstream<<"Server: Saving environment metadata"<<std::endl;
+       m_env.saveMeta(m_mapsavedir);
        
        /*
                Stop threads
@@ -1136,14 +1151,17 @@ void Server::AsyncRunStep()
        }
        
        /*
-               Update m_time_of_day
+               Update m_time_of_day and overall game time
        */
        {
+               JMutexAutoLock envlock(m_env_mutex);
+
                m_time_counter += dtime;
                f32 speed = g_settings.getFloat("time_speed") * 24000./(24.*3600);
                u32 units = (u32)(m_time_counter*speed);
                m_time_counter -= (f32)units / speed;
-               m_time_of_day.set((m_time_of_day.get() + units) % 24000);
+               
+               m_env.setTimeOfDay((m_env.getTimeOfDay() + units) % 24000);
                
                //dstream<<"Server: m_time_of_day = "<<m_time_of_day.get()<<std::endl;
 
@@ -1167,7 +1185,7 @@ void Server::AsyncRunStep()
                                //Player *player = m_env.getPlayer(client->peer_id);
                                
                                SharedBuffer<u8> data = makePacket_TOCLIENT_TIME_OF_DAY(
-                                               m_time_of_day.get());
+                                               m_env.getTimeOfDay());
                                // Send as reliable
                                m_con.Send(client->peer_id, 0, data, true);
                        }
@@ -1654,6 +1672,9 @@ void Server::AsyncRunStep()
 
                                // Save players
                                m_env.serializePlayers(m_mapsavedir);
+                               
+                               // Save environment metadata
+                               m_env.saveMeta(m_mapsavedir);
                        }
                }
        }
@@ -1734,8 +1755,9 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
                // [0] u16 TOSERVER_INIT
                // [2] u8 SER_FMT_VER_HIGHEST
                // [3] u8[20] player_name
+               // [23] u8[28] password <--- can be sent without this, from old versions
 
-               if(datasize < 3)
+               if(datasize < 2+1+PLAYERNAME_SIZE)
                        return;
 
                derr_server<<DTIME<<"Server: Got TOSERVER_INIT from "
@@ -1767,17 +1789,41 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
                */
                
                // Get player name
-               const u32 playername_size = 20;
-               char playername[playername_size];
-               for(u32 i=0; i<playername_size-1; i++)
+               char playername[PLAYERNAME_SIZE];
+               for(u32 i=0; i<PLAYERNAME_SIZE-1; i++)
                {
                        playername[i] = data[3+i];
                }
-               playername[playername_size-1] = 0;
-               
+               playername[PLAYERNAME_SIZE-1] = 0;
+       
+               // Get password
+               char password[PASSWORD_SIZE];
+               if(datasize == 2+1+PLAYERNAME_SIZE)
+               {
+                       // old version - assume blank password
+                       password[0] = 0;
+               }
+               else
+               {
+                               for(u32 i=0; i<PASSWORD_SIZE-1; i++)
+                               {
+                                       password[i] = data[23+i];
+                               }
+                               password[PASSWORD_SIZE-1] = 0;
+               }
+               Player *checkplayer = m_env.getPlayer(playername);
+               if(checkplayer != NULL && strcmp(checkplayer->getPassword(),password))
+               {
+                       derr_server<<DTIME<<"Server: peer_id="<<peer_id
+                                       <<": supplied invalid password for "
+                                       <<playername<<std::endl;
+                       SendAccessDenied(m_con, peer_id);
+                       return;
+               }
+
                // Get player
-               Player *player = emergePlayer(playername, "", peer_id);
-               //Player *player = m_env.getPlayer(peer_id);
+               Player *player = emergePlayer(playername, password, peer_id);
+
 
                /*{
                        // DEBUG: Test serialization
@@ -1875,7 +1921,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
                // Send time of day
                {
                        SharedBuffer<u8> data = makePacket_TOCLIENT_TIME_OF_DAY(
-                                       m_time_of_day.get());
+                                       m_env.getTimeOfDay());
                        m_con.Send(peer->id, 0, data, true);
                }
                
@@ -3138,6 +3184,20 @@ void Server::SendHP(con::Connection &con, u16 peer_id, u8 hp)
        con.Send(peer_id, 0, data, true);
 }
 
+void Server::SendAccessDenied(con::Connection &con, u16 peer_id)
+{
+       DSTACK(__FUNCTION_NAME);
+       std::ostringstream os(std::ios_base::binary);
+
+       writeU16(os, TOCLIENT_ACCESS_DENIED);
+
+       // Make data buffer
+       std::string s = os.str();
+       SharedBuffer<u8> data((u8*)s.c_str(), s.size());
+       // Send as reliable
+       con.Send(peer_id, 0, data, true);
+}
+
 /*
        Non-static send methods
 */
@@ -4052,8 +4112,7 @@ v3f findSpawnPos(ServerMap &map)
                        ), BS);
 }
 
-Player *Server::emergePlayer(const char *name, const char *password,
-               u16 peer_id)
+Player *Server::emergePlayer(const char *name, const char *password, u16 peer_id)
 {
        /*
                Try to get an existing player
@@ -4099,6 +4158,7 @@ Player *Server::emergePlayer(const char *name, const char *password,
                //player->peer_id = PEER_ID_INEXISTENT;
                player->peer_id = peer_id;
                player->updateName(name);
+               player->updatePassword(password);
 
                /*
                        Set player position