Replace stray tab with whitespace in guiFormSpecMenu.cpp (#9317)

[dragonfireclient.git] / src / server.h

diff --git a/src/server.h b/src/server.h
index aae589f9af05bf06996b6abc87647230bccd00ff..d61840871b933d6afa9b1cf84f45d4be52f58909 100644 (file)
--- a/src/server.h
+++ b/src/server.h
@@ -17,25 +17,24 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 

-#ifndef SERVER_HEADER
-#define SERVER_HEADER
+#pragma once

 
 

-#include "network/connection.h"

 #include "irr_v3d.h"
 #include "map.h"
 #include "hud.h"
 #include "gamedef.h"
 #include "serialization.h" // For SER_FMT_VER_INVALID
 #include "irr_v3d.h"
 #include "map.h"
 #include "hud.h"
 #include "gamedef.h"
 #include "serialization.h" // For SER_FMT_VER_INVALID

-#include "mods.h"
+#include "content/mods.h"

 #include "inventorymanager.h"
 #include "inventorymanager.h"

-#include "subgame.h"
+#include "content/subgames.h"

 #include "tileanimation.h" // struct TileAnimationParams
 #include "tileanimation.h" // struct TileAnimationParams

+#include "network/peerhandler.h"
+#include "network/address.h"

 #include "util/numeric.h"
 #include "util/thread.h"
 #include "util/basic_macros.h"
 #include "serverenvironment.h"
 #include "clientiface.h"
 #include "util/numeric.h"
 #include "util/thread.h"
 #include "util/basic_macros.h"
 #include "serverenvironment.h"
 #include "clientiface.h"

-#include "remoteplayer.h"

 #include "chatmessage.h"
 #include <string>
 #include <list>
 #include "chatmessage.h"
 #include <string>
 #include <list>


@@ -46,19 +45,24 @@ class ChatEvent;
 struct ChatEventChat;
 struct ChatInterface;
 class IWritableItemDefManager;
 struct ChatEventChat;
 struct ChatInterface;
 class IWritableItemDefManager;

-class IWritableNodeDefManager;
+class NodeDefManager;

 class IWritableCraftDefManager;
 class BanManager;
 class EventManager;
 class Inventory;
 class IWritableCraftDefManager;
 class BanManager;
 class EventManager;
 class Inventory;

+class ModChannelMgr;
+class RemotePlayer;

 class PlayerSAO;
 class PlayerSAO;

+struct PlayerHPChangeReason;

 class IRollbackManager;
 struct RollbackAction;
 class EmergeManager;
 class ServerScripting;
 class ServerEnvironment;
 struct SimpleSoundSpec;
 class IRollbackManager;
 struct RollbackAction;
 class EmergeManager;
 class ServerScripting;
 class ServerEnvironment;
 struct SimpleSoundSpec;

+struct CloudParams;

 class ServerThread;
 class ServerThread;

+class ServerModManager;

 
 enum ClientDeletionReason {
        CDR_LEAVE,
 
 enum ClientDeletionReason {
        CDR_LEAVE,


@@ -102,7 +106,7 @@ struct ServerPlayingSound
 {
        ServerSoundParams params;
        SimpleSoundSpec spec;
 {
        ServerSoundParams params;
        SimpleSoundSpec spec;

-       std::unordered_set<u16> clients; // peer ids
+       std::unordered_set<session_t> clients; // peer ids

 };
 
 class Server : public con::PeerHandler, public MapEventReceiver,
 };
 
 class Server : public con::PeerHandler, public MapEventReceiver,


@@ -117,14 +121,15 @@ class Server : public con::PeerHandler, public MapEventReceiver,
                const std::string &path_world,
                const SubgameSpec &gamespec,
                bool simple_singleplayer_mode,
                const std::string &path_world,
                const SubgameSpec &gamespec,
                bool simple_singleplayer_mode,

-               bool ipv6,
+               Address bind_addr,

                bool dedicated,
                ChatInterface *iface = nullptr
        );
        ~Server();
        DISABLE_CLASS_COPY(Server);
 
                bool dedicated,
                ChatInterface *iface = nullptr
        );
        ~Server();
        DISABLE_CLASS_COPY(Server);
 

-       void start(Address bind_addr);
+       void init();
+       void start();

        void stop();
        // This is mainly a way to pass the time to the server.
        // Actual processing is done in an another thread.
        void stop();
        // This is mainly a way to pass the time to the server.
        // Actual processing is done in an another thread.


@@ -132,7 +137,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        // This is run by ServerThread and does the actual processing
        void AsyncRunStep(bool initial_step=false);
        void Receive();
        // This is run by ServerThread and does the actual processing
        void AsyncRunStep(bool initial_step=false);
        void Receive();

-       PlayerSAO* StageTwoClientInit(u16 peer_id);
+       PlayerSAO* StageTwoClientInit(session_t peer_id);

 
        /*
         * Command Handlers
 
        /*
         * Command Handlers


@@ -143,8 +148,10 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        void handleCommand_Null(NetworkPacket* pkt) {};
        void handleCommand_Deprecated(NetworkPacket* pkt);
        void handleCommand_Init(NetworkPacket* pkt);
        void handleCommand_Null(NetworkPacket* pkt) {};
        void handleCommand_Deprecated(NetworkPacket* pkt);
        void handleCommand_Init(NetworkPacket* pkt);

-       void handleCommand_Init_Legacy(NetworkPacket* pkt);

        void handleCommand_Init2(NetworkPacket* pkt);
        void handleCommand_Init2(NetworkPacket* pkt);

+       void handleCommand_ModChannelJoin(NetworkPacket *pkt);
+       void handleCommand_ModChannelLeave(NetworkPacket *pkt);
+       void handleCommand_ModChannelMsg(NetworkPacket *pkt);

        void handleCommand_RequestMedia(NetworkPacket* pkt);
        void handleCommand_ClientReady(NetworkPacket* pkt);
        void handleCommand_GotBlocks(NetworkPacket* pkt);
        void handleCommand_RequestMedia(NetworkPacket* pkt);
        void handleCommand_ClientReady(NetworkPacket* pkt);
        void handleCommand_GotBlocks(NetworkPacket* pkt);


@@ -166,7 +173,8 @@ class Server : public con::PeerHandler, public MapEventReceiver,
 
        void ProcessData(NetworkPacket *pkt);
 
 
        void ProcessData(NetworkPacket *pkt);
 

-       void Send(NetworkPacket* pkt);
+       void Send(NetworkPacket *pkt);
+       void Send(session_t peer_id, NetworkPacket *pkt);

 
        // Helper for handleCommand_PlayerPos and handleCommand_Interact
        void process_PlayerPos(RemotePlayer *player, PlayerSAO *playersao,
 
        // Helper for handleCommand_PlayerPos and handleCommand_Interact
        void process_PlayerPos(RemotePlayer *player, PlayerSAO *playersao,


@@ -181,20 +189,20 @@ class Server : public con::PeerHandler, public MapEventReceiver,
                This is accessed by the map, which is inside the environment,
                so it shouldn't be a problem.
        */
                This is accessed by the map, which is inside the environment,
                so it shouldn't be a problem.
        */

-       void onMapEditEvent(MapEditEvent *event);
+       void onMapEditEvent(const MapEditEvent &event);

 
        /*
                Shall be called with the environment and the connection locked.
        */
        Inventory* getInventory(const InventoryLocation &loc);
 
        /*
                Shall be called with the environment and the connection locked.
        */
        Inventory* getInventory(const InventoryLocation &loc);

-       void setInventoryModified(const InventoryLocation &loc, bool playerSend = true);
+       void setInventoryModified(const InventoryLocation &loc);

 
        // Connection must be locked when called
        std::wstring getStatusString();
        inline double getUptime() const { return m_uptime.m_value; }
 
        // read shutdown state
 
        // Connection must be locked when called
        std::wstring getStatusString();
        inline double getUptime() const { return m_uptime.m_value; }
 
        // read shutdown state

-       inline bool getShutdownRequested() const { return m_shutdown_requested; }
+       inline bool isShutdownRequested() const { return m_shutdown_state.is_requested; }

 
        // request server to shutdown
        void requestShutdown(const std::string &msg, bool reconnect, float delay = 0.0f);
 
        // request server to shutdown
        void requestShutdown(const std::string &msg, bool reconnect, float delay = 0.0f);


@@ -210,6 +218,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        bool checkPriv(const std::string &name, const std::string &priv);
        void reportPrivsModified(const std::string &name=""); // ""=all
        void reportInventoryFormspecModified(const std::string &name);
        bool checkPriv(const std::string &name, const std::string &priv);
        void reportPrivsModified(const std::string &name=""); // ""=all
        void reportInventoryFormspecModified(const std::string &name);

+       void reportFormspecPrependModified(const std::string &name);

 
        void setIpBanned(const std::string &ip, const std::string &name);
        void unsetIpBanned(const std::string &ip_or_name);
 
        void setIpBanned(const std::string &ip, const std::string &name);
        void unsetIpBanned(const std::string &ip_or_name);


@@ -220,7 +229,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        void spawnParticle(const std::string &playername,
                v3f pos, v3f velocity, v3f acceleration,
                float expirationtime, float size,
        void spawnParticle(const std::string &playername,
                v3f pos, v3f velocity, v3f acceleration,
                float expirationtime, float size,

-               bool collisiondetection, bool collision_removal,
+               bool collisiondetection, bool collision_removal, bool object_collision,

                bool vertical, const std::string &texture,
                const struct TileAnimationParams &animation, u8 glow);
 
                bool vertical, const std::string &texture,
                const struct TileAnimationParams &animation, u8 glow);
 


@@ -230,7 +239,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
                v3f minacc, v3f maxacc,
                float minexptime, float maxexptime,
                float minsize, float maxsize,
                v3f minacc, v3f maxacc,
                float minexptime, float maxexptime,
                float minsize, float maxsize,

-               bool collisiondetection, bool collision_removal,
+               bool collisiondetection, bool collision_removal, bool object_collision,

                ServerActiveObject *attached,
                bool vertical, const std::string &texture,
                const std::string &playername, const struct TileAnimationParams &animation,
                ServerActiveObject *attached,
                bool vertical, const std::string &texture,
                const std::string &playername, const struct TileAnimationParams &animation,


@@ -239,7 +248,9 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        void deleteParticleSpawner(const std::string &playername, u32 id);
 
        // Creates or resets inventory
        void deleteParticleSpawner(const std::string &playername, u32 id);
 
        // Creates or resets inventory

-       Inventory* createDetachedInventory(const std::string &name, const std::string &player="");
+       Inventory *createDetachedInventory(const std::string &name,
+                       const std::string &player = "");
+       bool removeDetachedInventory(const std::string &name);

 
        // Envlock and conlock should be locked when using scriptapi
        ServerScripting *getScriptIface(){ return m_script; }
 
        // Envlock and conlock should be locked when using scriptapi
        ServerScripting *getScriptIface(){ return m_script; }


@@ -252,18 +263,17 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        // IGameDef interface
        // Under envlock
        virtual IItemDefManager* getItemDefManager();
        // IGameDef interface
        // Under envlock
        virtual IItemDefManager* getItemDefManager();

-       virtual INodeDefManager* getNodeDefManager();
+       virtual const NodeDefManager* getNodeDefManager();

        virtual ICraftDefManager* getCraftDefManager();
        virtual u16 allocateUnknownNodeId(const std::string &name);
        virtual ICraftDefManager* getCraftDefManager();
        virtual u16 allocateUnknownNodeId(const std::string &name);

-       virtual MtEventManager* getEventManager();

        IRollbackManager *getRollbackManager() { return m_rollback; }
        virtual EmergeManager *getEmergeManager() { return m_emerge; }
 
        IWritableItemDefManager* getWritableItemDefManager();
        IRollbackManager *getRollbackManager() { return m_rollback; }
        virtual EmergeManager *getEmergeManager() { return m_emerge; }
 
        IWritableItemDefManager* getWritableItemDefManager();

-       IWritableNodeDefManager* getWritableNodeDefManager();
+       NodeDefManager* getWritableNodeDefManager();

        IWritableCraftDefManager* getWritableCraftDefManager();
 
        IWritableCraftDefManager* getWritableCraftDefManager();
 

-       virtual const std::vector<ModSpec> &getMods() const { return m_mods; }
+       virtual const std::vector<ModSpec> &getMods() const;

        virtual const ModSpec* getModSpec(const std::string &modname) const;
        void getModNames(std::vector<std::string> &modlist);
        std::string getBuiltinLuaPath();
        virtual const ModSpec* getModSpec(const std::string &modname) const;
        void getModNames(std::vector<std::string> &modlist);
        std::string getBuiltinLuaPath();


@@ -286,32 +296,19 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        bool hudChange(RemotePlayer *player, u32 id, HudElementStat stat, void *value);
        bool hudSetFlags(RemotePlayer *player, u32 flags, u32 mask);
        bool hudSetHotbarItemcount(RemotePlayer *player, s32 hotbar_itemcount);
        bool hudChange(RemotePlayer *player, u32 id, HudElementStat stat, void *value);
        bool hudSetFlags(RemotePlayer *player, u32 flags, u32 mask);
        bool hudSetHotbarItemcount(RemotePlayer *player, s32 hotbar_itemcount);

-       s32 hudGetHotbarItemcount(RemotePlayer *player) const
-                       { return player->getHotbarItemcount(); }
-       void hudSetHotbarImage(RemotePlayer *player, std::string name);
-       std::string hudGetHotbarImage(RemotePlayer *player);
-       void hudSetHotbarSelectedImage(RemotePlayer *player, std::string name);
-       const std::string &hudGetHotbarSelectedImage(RemotePlayer *player) const
-       {
-               return player->getHotbarSelectedImage();
-       }
+       void hudSetHotbarImage(RemotePlayer *player, const std::string &name);
+       void hudSetHotbarSelectedImage(RemotePlayer *player, const std::string &name);

 
 

-       inline Address getPeerAddress(u16 peer_id)
-                       { return m_con.GetPeerAddress(peer_id); }
+       Address getPeerAddress(session_t peer_id);

 
 

-       bool setLocalPlayerAnimations(RemotePlayer *player, v2s32 animation_frames[4],
+       void setLocalPlayerAnimations(RemotePlayer *player, v2s32 animation_frames[4],

                        f32 frame_speed);
                        f32 frame_speed);

-       bool setPlayerEyeOffset(RemotePlayer *player, v3f first, v3f third);
+       void setPlayerEyeOffset(RemotePlayer *player, const v3f &first, const v3f &third);

 
 

-       bool setSky(RemotePlayer *player, const video::SColor &bgcolor,
+       void setSky(RemotePlayer *player, const video::SColor &bgcolor,

                        const std::string &type, const std::vector<std::string> &params,
                        bool &clouds);
                        const std::string &type, const std::vector<std::string> &params,
                        bool &clouds);

-       bool setClouds(RemotePlayer *player, float density,
-                       const video::SColor &color_bright,
-                       const video::SColor &color_ambient,
-                       float height,
-                       float thickness,
-                       const v2f &speed);
+       void setClouds(RemotePlayer *player, const CloudParams &params);

 
        bool overrideDayNightRatio(RemotePlayer *player, bool do_override, float brightness);
 
 
        bool overrideDayNightRatio(RemotePlayer *player, bool do_override, float brightness);
 


@@ -319,27 +316,41 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        void peerAdded(con::Peer *peer);
        void deletingPeer(con::Peer *peer, bool timeout);
 
        void peerAdded(con::Peer *peer);
        void deletingPeer(con::Peer *peer, bool timeout);
 

-       void DenySudoAccess(u16 peer_id);
-       void DenyAccessVerCompliant(u16 peer_id, u16 proto_ver, AccessDeniedCode reason,
+       void DenySudoAccess(session_t peer_id);
+       void DenyAccessVerCompliant(session_t peer_id, u16 proto_ver, AccessDeniedCode reason,

                const std::string &str_reason = "", bool reconnect = false);
                const std::string &str_reason = "", bool reconnect = false);

-       void DenyAccess(u16 peer_id, AccessDeniedCode reason, const std::string &custom_reason="");
-       void acceptAuth(u16 peer_id, bool forSudoMode);
-       void DenyAccess_Legacy(u16 peer_id, const std::wstring &reason);
-       bool getClientConInfo(u16 peer_id, con::rtt_stat_type type,float* retval);
-       bool getClientInfo(u16 peer_id,ClientState* state, u32* uptime,
+       void DenyAccess(session_t peer_id, AccessDeniedCode reason,
+               const std::string &custom_reason = "");
+       void acceptAuth(session_t peer_id, bool forSudoMode);
+       void DenyAccess_Legacy(session_t peer_id, const std::wstring &reason);
+       void DisconnectPeer(session_t peer_id);
+       bool getClientConInfo(session_t peer_id, con::rtt_stat_type type, float *retval);
+       bool getClientInfo(session_t peer_id, ClientState *state, u32 *uptime,

                        u8* ser_vers, u16* prot_vers, u8* major, u8* minor, u8* patch,
                        std::string* vers_string);
 
        void printToConsoleOnly(const std::string &text);
 
                        u8* ser_vers, u16* prot_vers, u8* major, u8* minor, u8* patch,
                        std::string* vers_string);
 
        void printToConsoleOnly(const std::string &text);
 

-       void SendPlayerHPOrDie(PlayerSAO *player);
+       void SendPlayerHPOrDie(PlayerSAO *player, const PlayerHPChangeReason &reason);

        void SendPlayerBreath(PlayerSAO *sao);
        void SendPlayerBreath(PlayerSAO *sao);

-       void SendInventory(PlayerSAO* playerSAO);
-       void SendMovePlayer(u16 peer_id);
+       void SendInventory(PlayerSAO *playerSAO, bool incremental);
+       void SendMovePlayer(session_t peer_id);
+       void SendPlayerSpeed(session_t peer_id, const v3f &added_vel);
+       void SendPlayerFov(session_t peer_id);
+
+       void sendDetachedInventories(session_t peer_id, bool incremental);

 
        virtual bool registerModStorage(ModMetadata *storage);
        virtual void unregisterModStorage(const std::string &name);
 
 
        virtual bool registerModStorage(ModMetadata *storage);
        virtual void unregisterModStorage(const std::string &name);
 

+       bool joinModChannel(const std::string &channel);
+       bool leaveModChannel(const std::string &channel);
+       bool sendModChannelMessage(const std::string &channel, const std::string &message);
+       ModChannel *getModChannel(const std::string &channel);
+
+       // Send block to specific player only
+       bool SendBlock(session_t peer_id, const v3s16 &blockpos);
+

        // Bind address
        Address m_bind_addr;
 
        // Bind address
        Address m_bind_addr;
 


@@ -347,48 +358,66 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        std::mutex m_env_mutex;
 
 private:
        std::mutex m_env_mutex;
 
 private:

-

        friend class EmergeThread;
        friend class RemoteClient;
        friend class EmergeThread;
        friend class RemoteClient;

-
-       void SendMovement(u16 peer_id);
-       void SendHP(u16 peer_id, u8 hp);
-       void SendBreath(u16 peer_id, u16 breath);
-       void SendAccessDenied(u16 peer_id, AccessDeniedCode reason,
+       friend class TestServerShutdownState;
+
+       struct ShutdownState {
+               friend class TestServerShutdownState;
+               public:
+                       bool is_requested = false;
+                       bool should_reconnect = false;
+                       std::string message;
+
+                       void reset();
+                       void trigger(float delay, const std::string &msg, bool reconnect);
+                       void tick(float dtime, Server *server);
+                       std::wstring getShutdownTimerMessage() const;
+                       bool isTimerRunning() const { return m_timer > 0.0f; }
+               private:
+                       float m_timer = 0.0f;
+       };
+
+       void SendMovement(session_t peer_id);
+       void SendHP(session_t peer_id, u16 hp);
+       void SendBreath(session_t peer_id, u16 breath);
+       void SendAccessDenied(session_t peer_id, AccessDeniedCode reason,

                const std::string &custom_reason, bool reconnect = false);
                const std::string &custom_reason, bool reconnect = false);

-       void SendAccessDenied_Legacy(u16 peer_id, const std::wstring &reason);
-       void SendDeathscreen(u16 peer_id,bool set_camera_point_target, v3f camera_point_target);
-       void SendItemDef(u16 peer_id,IItemDefManager *itemdef, u16 protocol_version);
-       void SendNodeDef(u16 peer_id,INodeDefManager *nodedef, u16 protocol_version);
+       void SendAccessDenied_Legacy(session_t peer_id, const std::wstring &reason);
+       void SendDeathscreen(session_t peer_id, bool set_camera_point_target,
+               v3f camera_point_target);
+       void SendItemDef(session_t peer_id, IItemDefManager *itemdef, u16 protocol_version);
+       void SendNodeDef(session_t peer_id, const NodeDefManager *nodedef,
+               u16 protocol_version);

 
        /* mark blocks not sent for all clients */
        void SetBlocksNotSent(std::map<v3s16, MapBlock *>& block);
 
 
 
        /* mark blocks not sent for all clients */
        void SetBlocksNotSent(std::map<v3s16, MapBlock *>& block);
 
 

-       void SendChatMessage(u16 peer_id, const ChatMessage &message);
-       void SendTimeOfDay(u16 peer_id, u16 time, f32 time_speed);
-       void SendPlayerHP(u16 peer_id);
-
-       void SendLocalPlayerAnimations(u16 peer_id, v2s32 animation_frames[4], f32 animation_speed);
-       void SendEyeOffset(u16 peer_id, v3f first, v3f third);
-       void SendPlayerPrivileges(u16 peer_id);
-       void SendPlayerInventoryFormspec(u16 peer_id);
-       void SendShowFormspecMessage(u16 peer_id, const std::string &formspec, const std::string &formname);
-       void SendHUDAdd(u16 peer_id, u32 id, HudElement *form);
-       void SendHUDRemove(u16 peer_id, u32 id);
-       void SendHUDChange(u16 peer_id, u32 id, HudElementStat stat, void *value);
-       void SendHUDSetFlags(u16 peer_id, u32 flags, u32 mask);
-       void SendHUDSetParam(u16 peer_id, u16 param, const std::string &value);
-       void SendSetSky(u16 peer_id, const video::SColor &bgcolor,
+       virtual void SendChatMessage(session_t peer_id, const ChatMessage &message);
+       void SendTimeOfDay(session_t peer_id, u16 time, f32 time_speed);
+       void SendPlayerHP(session_t peer_id);
+
+       void SendLocalPlayerAnimations(session_t peer_id, v2s32 animation_frames[4],
+               f32 animation_speed);
+       void SendEyeOffset(session_t peer_id, v3f first, v3f third);
+       void SendPlayerPrivileges(session_t peer_id);
+       void SendPlayerInventoryFormspec(session_t peer_id);
+       void SendPlayerFormspecPrepend(session_t peer_id);
+       void SendShowFormspecMessage(session_t peer_id, const std::string &formspec,
+               const std::string &formname);
+       void SendHUDAdd(session_t peer_id, u32 id, HudElement *form);
+       void SendHUDRemove(session_t peer_id, u32 id);
+       void SendHUDChange(session_t peer_id, u32 id, HudElementStat stat, void *value);
+       void SendHUDSetFlags(session_t peer_id, u32 flags, u32 mask);
+       void SendHUDSetParam(session_t peer_id, u16 param, const std::string &value);
+       void SendSetSky(session_t peer_id, const video::SColor &bgcolor,

                        const std::string &type, const std::vector<std::string> &params,
                        bool &clouds);
                        const std::string &type, const std::vector<std::string> &params,
                        bool &clouds);

-       void SendCloudParams(u16 peer_id, float density,
-                       const video::SColor &color_bright,
-                       const video::SColor &color_ambient,
-                       float height,
-                       float thickness,
-                       const v2f &speed);
-       void SendOverrideDayNightRatio(u16 peer_id, bool do_override, float ratio);
+       void SendCloudParams(session_t peer_id, const CloudParams &params);
+       void SendOverrideDayNightRatio(session_t peer_id, bool do_override, float ratio);
+       void broadcastModChannelMessage(const std::string &channel,
+                       const std::string &message, session_t from_peer);

 
        /*
                Send a node removal/addition event to all clients except ignore_id.
 
        /*
                Send a node removal/addition event to all clients except ignore_id.


@@ -396,62 +425,65 @@ class Server : public con::PeerHandler, public MapEventReceiver,
                far_d_nodes are ignored and their peer_ids are added to far_players
        */
        // Envlock and conlock should be locked when calling these
                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,
-                       std::vector<u16> *far_players=NULL, float far_d_nodes=100);
-       void sendAddNode(v3s16 p, MapNode n, u16 ignore_id=0,
-                       std::vector<u16> *far_players=NULL, float far_d_nodes=100,
-                       bool remove_metadata=true);
-       void setBlockNotSent(v3s16 p);
+       void sendRemoveNode(v3s16 p, std::unordered_set<u16> *far_players = nullptr,
+                       float far_d_nodes = 100);
+       void sendAddNode(v3s16 p, MapNode n,
+                       std::unordered_set<u16> *far_players = nullptr,
+                       float far_d_nodes = 100, bool remove_metadata = true);
+
+       void sendMetadataChanged(const std::list<v3s16> &meta_updates,
+                       float far_d_nodes = 100);

 
        // Environment and Connection must be locked when called
 
        // Environment and Connection must be locked when called

-       void SendBlockNoLock(u16 peer_id, MapBlock *block, u8 ver, u16 net_proto_version);
+       void SendBlockNoLock(session_t peer_id, MapBlock *block, u8 ver, u16 net_proto_version);

 
        // Sends blocks to clients (locks env and con on its own)
        void SendBlocks(float dtime);
 
        void fillMediaCache();
 
        // Sends blocks to clients (locks env and con on its own)
        void SendBlocks(float dtime);
 
        void fillMediaCache();

-       void sendMediaAnnouncement(u16 peer_id);
-       void sendRequestedMedia(u16 peer_id,
+       void sendMediaAnnouncement(session_t peer_id, const std::string &lang_code);
+       void sendRequestedMedia(session_t peer_id,

                        const std::vector<std::string> &tosend);
 
                        const std::vector<std::string> &tosend);
 

-       void sendDetachedInventory(const std::string &name, u16 peer_id);
-       void sendDetachedInventories(u16 peer_id);
+       void sendDetachedInventory(const std::string &name, session_t peer_id);

 
        // Adds a ParticleSpawner on peer with peer_id (PEER_ID_INEXISTENT == all)
 
        // Adds a ParticleSpawner on peer with peer_id (PEER_ID_INEXISTENT == all)

-       void SendAddParticleSpawner(u16 peer_id, u16 protocol_version,
+       void SendAddParticleSpawner(session_t peer_id, u16 protocol_version,

                u16 amount, float spawntime,
                v3f minpos, v3f maxpos,
                v3f minvel, v3f maxvel,
                v3f minacc, v3f maxacc,
                float minexptime, float maxexptime,
                float minsize, float maxsize,
                u16 amount, float spawntime,
                v3f minpos, v3f maxpos,
                v3f minvel, v3f maxvel,
                v3f minacc, v3f maxacc,
                float minexptime, float maxexptime,
                float minsize, float maxsize,

-               bool collisiondetection, bool collision_removal,
+               bool collisiondetection, bool collision_removal, bool object_collision,

                u16 attached_id,
                bool vertical, const std::string &texture, u32 id,
                const struct TileAnimationParams &animation, u8 glow);
 
                u16 attached_id,
                bool vertical, const std::string &texture, u32 id,
                const struct TileAnimationParams &animation, u8 glow);
 

-       void SendDeleteParticleSpawner(u16 peer_id, u32 id);
+       void SendDeleteParticleSpawner(session_t peer_id, u32 id);

 
        // Spawns particle on peer with peer_id (PEER_ID_INEXISTENT == all)
 
        // Spawns particle on peer with peer_id (PEER_ID_INEXISTENT == all)

-       void SendSpawnParticle(u16 peer_id, u16 protocol_version,
+       void SendSpawnParticle(session_t peer_id, u16 protocol_version,

                v3f pos, v3f velocity, v3f acceleration,
                float expirationtime, float size,
                v3f pos, v3f velocity, v3f acceleration,
                float expirationtime, float size,

-               bool collisiondetection, bool collision_removal,
+               bool collisiondetection, bool collision_removal, bool object_collision,

                bool vertical, const std::string &texture,
                const struct TileAnimationParams &animation, u8 glow);
 
                bool vertical, const std::string &texture,
                const struct TileAnimationParams &animation, u8 glow);
 

-       u32 SendActiveObjectRemoveAdd(u16 peer_id, const std::string &datas);
-       void SendActiveObjectMessages(u16 peer_id, const std::string &datas, bool reliable = true);
-       void SendCSMFlavourLimits(u16 peer_id);
+       void SendActiveObjectRemoveAdd(RemoteClient *client, PlayerSAO *playersao);
+       void SendActiveObjectMessages(session_t peer_id, const std::string &datas,
+               bool reliable = true);
+       void SendCSMRestrictionFlags(session_t peer_id);

 
        /*
                Something random
        */
 
 
        /*
                Something random
        */
 

-       void DiePlayer(u16 peer_id);
-       void RespawnPlayer(u16 peer_id);
-       void DeleteClient(u16 peer_id, ClientDeletionReason reason);
+       void DiePlayer(session_t peer_id, const PlayerHPChangeReason &reason);
+       void RespawnPlayer(session_t peer_id);
+       void DeleteClient(session_t peer_id, ClientDeletionReason reason);

        void UpdateCrafting(RemotePlayer *player);
        void UpdateCrafting(RemotePlayer *player);

+       bool checkInteractDistance(RemotePlayer *player, const f32 d, const std::string &what);

 
        void handleChatInterfaceEvent(ChatEvent *evt);
 
 
        void handleChatInterfaceEvent(ChatEvent *evt);
 


@@ -463,12 +495,12 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        void handleAdminChat(const ChatEventChat *evt);
 
        // When called, connection mutex should be locked
        void handleAdminChat(const ChatEventChat *evt);
 
        // When called, connection mutex should be locked

-       RemoteClient* getClient(u16 peer_id,ClientState state_min=CS_Active);
-       RemoteClient* getClientNoEx(u16 peer_id,ClientState state_min=CS_Active);
+       RemoteClient* getClient(session_t peer_id, ClientState state_min = CS_Active);
+       RemoteClient* getClientNoEx(session_t peer_id, ClientState state_min = CS_Active);

 
        // When called, environment mutex should be locked
 
        // When called, environment mutex should be locked

-       std::string getPlayerName(u16 peer_id);
-       PlayerSAO* getPlayerSAO(u16 peer_id);
+       std::string getPlayerName(session_t peer_id);
+       PlayerSAO *getPlayerSAO(session_t peer_id);

 
        /*
                Get a player from memory or creates one.
 
        /*
                Get a player from memory or creates one.


@@ -477,14 +509,13 @@ class Server : public con::PeerHandler, public MapEventReceiver,
 
                Call with env and con locked.
        */
 
                Call with env and con locked.
        */

-       PlayerSAO *emergePlayer(const char *name, u16 peer_id, u16 proto_version);
+       PlayerSAO *emergePlayer(const char *name, session_t peer_id, u16 proto_version);

 
        void handlePeerChanges();
 
        /*
                Variables
        */
 
        void handlePeerChanges();
 
        /*
                Variables
        */

-

        // World directory
        std::string m_path_world;
        // Subgame specification
        // World directory
        std::string m_path_world;
        // Subgame specification


@@ -511,14 +542,13 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        ServerEnvironment *m_env = nullptr;
 
        // server connection
        ServerEnvironment *m_env = nullptr;
 
        // server connection

-       con::Connection m_con;
+       std::shared_ptr<con::Connection> m_con;

 
        // Ban checking
        BanManager *m_banmanager = nullptr;
 
        // Rollback manager (behind m_env_mutex)
        IRollbackManager *m_rollback = nullptr;
 
        // Ban checking
        BanManager *m_banmanager = nullptr;
 
        // Rollback manager (behind m_env_mutex)
        IRollbackManager *m_rollback = nullptr;

-       bool m_enable_rollback_recording = false; // Updated once in a while

 
        // Emerge manager
        EmergeManager *m_emerge = nullptr;
 
        // Emerge manager
        EmergeManager *m_emerge = nullptr;


@@ -531,7 +561,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        IWritableItemDefManager *m_itemdef;
 
        // Node definition manager
        IWritableItemDefManager *m_itemdef;
 
        // Node definition manager

-       IWritableNodeDefManager *m_nodedef;
+       NodeDefManager *m_nodedef;

 
        // Craft definition manager
        IWritableCraftDefManager *m_craftdef;
 
        // Craft definition manager
        IWritableCraftDefManager *m_craftdef;


@@ -540,12 +570,11 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        EventManager *m_event;
 
        // Mods
        EventManager *m_event;
 
        // Mods

-       std::vector<ModSpec> m_mods;
+       std::unique_ptr<ServerModManager> m_modmgr;

 
        /*
                Threads
        */
 
        /*
                Threads
        */

-

        // A buffer for time steps
        // step() increments and AsyncRunStep() run by m_thread reads it.
        float m_step_dtime = 0.0f;
        // A buffer for time steps
        // step() increments and AsyncRunStep() run by m_thread reads it.
        float m_step_dtime = 0.0f;


@@ -560,14 +589,14 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        /*
                Time related stuff
        */
        /*
                Time related stuff
        */

-

        // Timer for sending time of day over network
        float m_time_of_day_send_timer = 0.0f;
        // Uptime of server in seconds
        MutexedVariable<double> m_uptime;
        // Timer for sending time of day over network
        float m_time_of_day_send_timer = 0.0f;
        // Uptime of server in seconds
        MutexedVariable<double> m_uptime;

+

        /*
        /*

-        Client interface
-        */
+               Client interface
+       */

        ClientInterface m_clients;
 
        /*
        ClientInterface m_clients;
 
        /*


@@ -577,14 +606,13 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        */
        std::queue<con::PeerChange> m_peer_change_queue;
 
        */
        std::queue<con::PeerChange> m_peer_change_queue;
 

+       std::unordered_map<session_t, std::string> m_formspec_state_data;
+

        /*
                Random stuff
        */
 
        /*
                Random stuff
        */
 

-       bool m_shutdown_requested = false;
-       std::string m_shutdown_msg;
-       bool m_shutdown_ask_reconnect = false;
-       float m_shutdown_timer = 0.0f;
+       ShutdownState m_shutdown_state;

 
        ChatInterface *m_admin_chat;
        std::string m_admin_nick;
 
        ChatInterface *m_admin_chat;
        std::string m_admin_nick;


@@ -603,12 +631,6 @@ class Server : public con::PeerHandler, public MapEventReceiver,
                This is behind m_env_mutex
        */
        std::queue<MapEditEvent*> m_unsent_map_edit_queue;
                This is behind m_env_mutex
        */
        std::queue<MapEditEvent*> m_unsent_map_edit_queue;

-       /*
-               Set to true when the server itself is modifying the map and does
-               all sending of information by itself.
-               This is behind m_env_mutex
-       */
-       bool m_ignore_map_edit_events = false;

        /*
                If a non-empty area, map edit events contained within are left
                unsent. Done at map generation time to speed up editing of the
        /*
                If a non-empty area, map edit events contained within are left
                unsent. Done at map generation time to speed up editing of the


@@ -616,12 +638,6 @@ class Server : public con::PeerHandler, public MapEventReceiver,
                This is behind m_env_mutex
        */
        VoxelArea m_ignore_map_edit_events_area;
                This is behind m_env_mutex
        */
        VoxelArea m_ignore_map_edit_events_area;

-       /*
-               If set to !=0, the incoming MapEditEvents are modified to have
-               this peed id as the disabled recipient
-               This is behind m_env_mutex
-       */
-       u16 m_ignore_map_edit_events_peer_id = 0;

 
        // media files known to server
        std::unordered_map<std::string, MediaInfo> m_media;
 
        // media files known to server
        std::unordered_map<std::string, MediaInfo> m_media;


@@ -643,9 +659,12 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        std::unordered_map<std::string, ModMetadata *> m_mod_storages;
        float m_mod_storage_save_timer = 10.0f;
 
        std::unordered_map<std::string, ModMetadata *> m_mod_storages;
        float m_mod_storage_save_timer = 10.0f;
 

-       // CSM flavour limits byteflag
-       u64 m_csm_flavour_limits = CSMFlavourLimit::CSM_FL_NONE;
-       u32 m_csm_noderange_limit = 8;
+       // CSM restrictions byteflag
+       u64 m_csm_restriction_flags = CSMRestrictionFlags::CSM_RF_NONE;
+       u32 m_csm_restriction_noderange = 8;
+
+       // ModChannel manager
+       std::unique_ptr<ModChannelMgr> m_modchannel_mgr;

 };
 
 /*
 };
 
 /*


@@ -654,5 +673,3 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        Shuts down when kill is set to true.
 */
 void dedicated_server_loop(Server &server, bool &kill);
        Shuts down when kill is set to true.
 */
 void dedicated_server_loop(Server &server, bool &kill);

-
-#endif