Changed the Heal Amount of Apples from 6 to 2

[minetest.git] / src / server.h

diff --git a/src/server.h b/src/server.h
index a6da801be3be47cd56c09a33b934f36bd99df7bb..7065efacfe6e4d4d3f383402584bbf0b0490f196 100644 (file)
--- a/src/server.h
+++ b/src/server.h
@@ -17,10 +17,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-/*
-(c) 2010 Perttu Ahola <celeron55@gmail.com>
-*/
-
 #ifndef SERVER_HEADER
 #define SERVER_HEADER
 
@@ -33,6 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "map.h"
 #include "inventory.h"
 #include "auth.h"
+#include "ban.h"
 
 /*
        Some random functions
@@ -239,6 +236,8 @@ class RemoteClient
        u16 peer_id;
        // The serialization version to use with the client
        u8 serialization_version;
+       //
+       u16 net_proto_version;
        // Version is stored in here after INIT before INIT2
        u8 pending_serialization_version;
 
@@ -248,6 +247,7 @@ class RemoteClient
        {
                peer_id = 0;
                serialization_version = SER_FMT_VER_INVALID;
+               net_proto_version = 0;
                pending_serialization_version = SER_FMT_VER_INVALID;
                m_nearest_unsent_d = 0;
                m_nearest_unsent_reset_timer = 0.0;
@@ -368,7 +368,8 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        */
 
        Server(
-               std::string mapsavedir
+               std::string mapsavedir,
+               std::string configpath
        );
        ~Server();
        void start(unsigned short port);
@@ -424,7 +425,58 @@ class Server : public con::PeerHandler, public MapEventReceiver,
 
        // Envlock and conlock should be locked when calling this
        void SendMovePlayer(Player *player);
+       
+       u64 getPlayerAuthPrivs(const std::string &name)
+       {
+               try{
+                       return m_authmanager.getPrivs(name);
+               }
+               catch(AuthNotFoundException &e)
+               {
+                       dstream<<"WARNING: Auth not found for "<<name<<std::endl;
+                       return 0;
+               }
+       }
 
+       void setPlayerAuthPrivs(const std::string &name, u64 privs)
+       {
+               try{
+                       return m_authmanager.setPrivs(name, privs);
+               }
+               catch(AuthNotFoundException &e)
+               {
+                       dstream<<"WARNING: Auth not found for "<<name<<std::endl;
+               }
+       }
+       
+       // Saves g_settings to configpath given at initialization
+       void saveConfig()
+       {
+               if(m_configpath != "")
+                       g_settings.updateConfigFile(m_configpath.c_str());
+       }
+
+       void setIpBanned(const std::string &ip, const std::string &name)
+       {
+               m_banmanager.add(ip, name);
+               return;
+       }
+
+       void unsetIpBanned(const std::string &ip_or_name)
+       {
+               m_banmanager.remove(ip_or_name);
+               return;
+       }
+
+       std::string getBanDescription(const std::string &ip_or_name)
+       {
+               return m_banmanager.getBanDescription(ip_or_name);
+       }
+
+       con::Peer* getPeerNoEx(u16 peer_id)
+       {
+               return m_con.GetPeerNoEx(peer_id);
+       }
 
 private:
 
@@ -450,6 +502,10 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        void SendObjectData(float dtime);
        void SendPlayerInfos();
        void SendInventory(u16 peer_id);
+       // send wielded item info about player to all
+       void SendWieldedItem(const Player *player);
+       // send wielded item info about all players to all players
+       void SendPlayerItems();
        void SendChatMessage(u16 peer_id, const std::wstring &message);
        void BroadcastChatMessage(const std::wstring &message);
        void SendPlayerHP(Player *player);
@@ -458,15 +514,17 @@ class Server : public con::PeerHandler, public MapEventReceiver,
                Additionally, if far_players!=NULL, players further away than
                far_d_nodes are ignored and their peer_ids are added to far_players
        */
+       // Envlock and conlock should be locked when calling these
        void sendRemoveNode(v3s16 p, u16 ignore_id=0,
                        core::list<u16> *far_players=NULL, float far_d_nodes=100);
        void sendAddNode(v3s16 p, MapNode n, u16 ignore_id=0,
                        core::list<u16> *far_players=NULL, float far_d_nodes=100);
+       void setBlockNotSent(v3s16 p);
        
        // Environment and Connection must be locked when called
        void SendBlockNoLock(u16 peer_id, MapBlock *block, u8 ver);
        
-       // Sends blocks to clients
+       // Sends blocks to clients (locks env and con on its own)
        void SendBlocks(float dtime);
 
        /*
@@ -478,6 +536,15 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        // When called, connection mutex should be locked
        RemoteClient* getClient(u16 peer_id);
        
+       // When called, environment mutex should be locked
+       std::string getPlayerName(u16 peer_id)
+       {
+               Player *player = m_env.getPlayer(peer_id);
+               if(player == NULL)
+                       return "[id="+itos(peer_id);
+               return player->getName();
+       }
+
        /*
                Get a player from memory or creates one.
                If player is already connected, return NULL
@@ -493,6 +560,8 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        void handlePeerChange(PeerChange &c);
        void handlePeerChanges();
 
+       u64 getPlayerPrivs(Player *player);
+
        /*
                Variables
        */
@@ -503,6 +572,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        float m_objectdata_timer;
        float m_emergethread_trigger_timer;
        float m_savemap_timer;
+       IntervalLimiter m_map_timer_and_unload_interval;
        
        // NOTE: If connection and environment are both to be locked,
        // environment shall be locked first.
@@ -519,6 +589,9 @@ class Server : public con::PeerHandler, public MapEventReceiver,
 
        // User authentication
        AuthManager m_authmanager;
+
+       // Bann checking
+       BanManager m_banmanager;
        
        /*
                Threads
@@ -574,6 +647,9 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        // Map directory
        std::string m_mapsavedir;
 
+       // Configuration path ("" = no configuration file)
+       std::string m_configpath;
+
        bool m_shutdown_requested;
        
        /*
@@ -603,6 +679,8 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        */
        u16 m_ignore_map_edit_events_peer_id;
 
+       Profiler *m_profiler;
+
        friend class EmergeThread;
        friend class RemoteClient;
 };