Don't ship with broken languages (#4940)

[oweals/minetest.git] / src / server.h

diff --git a/src/server.h b/src/server.h
index fbca05f265607beb24babfc64a775ccd6aee45a2..4425d139b1658860d643c7243b339c468c341396 100644 (file)
--- a/src/server.h
+++ b/src/server.h
@@ -32,7 +32,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/numeric.h"
 #include "util/thread.h"
 #include "environment.h"
 #include "util/numeric.h"
 #include "util/thread.h"
 #include "environment.h"

+#include "chat_interface.h"

 #include "clientiface.h"
 #include "clientiface.h"

+#include "remoteplayer.h"

 #include "network/networkpacket.h"
 #include <string>
 #include <list>
 #include "network/networkpacket.h"
 #include <string>
 #include <list>


@@ -47,7 +49,6 @@ class IWritableCraftDefManager;
 class BanManager;
 class EventManager;
 class Inventory;
 class BanManager;
 class EventManager;
 class Inventory;

-class Player;

 class PlayerSAO;
 class IRollbackManager;
 struct RollbackAction;
 class PlayerSAO;
 class IRollbackManager;
 struct RollbackAction;


@@ -63,31 +64,6 @@ enum ClientDeletionReason {
        CDR_DENY
 };
 
        CDR_DENY
 };
 

-class MapEditEventIgnorer
-{
-public:
-       MapEditEventIgnorer(bool *flag):
-               m_flag(flag)
-       {
-               if(*m_flag == false)
-                       *m_flag = true;
-               else
-                       m_flag = NULL;
-       }
-
-       ~MapEditEventIgnorer()
-       {
-               if(m_flag)
-               {
-                       assert(*m_flag);
-                       *m_flag = false;
-               }
-       }
-
-private:
-       bool *m_flag;
-};
-

 class MapEditEventAreaIgnorer
 {
 public:
 class MapEditEventAreaIgnorer
 {
 public:


@@ -156,7 +132,7 @@ struct ServerSoundParams
 struct ServerPlayingSound
 {
        ServerSoundParams params;
 struct ServerPlayingSound
 {
        ServerSoundParams params;

-       std::set<u16> clients; // peer ids
+       UNORDERED_SET<u16> clients; // peer ids

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


@@ -171,7 +147,8 @@ public:
                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
+               bool ipv6,
+               ChatInterface *iface = NULL

        );
        ~Server();
        void start(Address bind_addr);
        );
        ~Server();
        void start(Address bind_addr);


@@ -220,7 +197,12 @@ public:
 
        void Send(NetworkPacket* pkt);
 
 
        void Send(NetworkPacket* pkt);
 

-       // Environment must be locked when called
+       // Helper for handleCommand_PlayerPos and handleCommand_Interact
+       void process_PlayerPos(RemotePlayer *player, PlayerSAO *playersao,
+               NetworkPacket *pkt);
+
+       // Both setter and getter need no envlock,
+       // can be called freely from threads

        void setTimeOfDay(u32 time);
 
        /*
        void setTimeOfDay(u32 time);
 
        /*


@@ -238,14 +220,18 @@ public:
 
        // Connection must be locked when called
        std::wstring getStatusString();
 
        // Connection must be locked when called
        std::wstring getStatusString();

+       inline double getUptime() const { return m_uptime.m_value; }

 
        // read shutdown state
 
        // read shutdown state

-       inline bool getShutdownRequested()
-                       { return m_shutdown_requested; }
+       inline bool getShutdownRequested() const { return m_shutdown_requested; }

 
        // request server to shutdown
 
        // request server to shutdown

-       inline void requestShutdown(void)
-                       { m_shutdown_requested = true; }
+       void requestShutdown(const std::string &msg, bool reconnect)
+       {
+               m_shutdown_requested = true;
+               m_shutdown_msg = msg;
+               m_shutdown_ask_reconnect = reconnect;
+       }

 
        // Returns -1 if failed, sound handle on success
        // Envlock
 
        // Returns -1 if failed, sound handle on success
        // Envlock


@@ -264,37 +250,27 @@ public:
 
        void notifyPlayer(const char *name, const std::wstring &msg);
        void notifyPlayers(const std::wstring &msg);
 
        void notifyPlayer(const char *name, const std::wstring &msg);
        void notifyPlayers(const std::wstring &msg);

-       void spawnParticle(const char *playername,
+       void spawnParticle(const std::string &playername,

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

-               bool collisiondetection, bool vertical, const std::string &texture);
+               bool collisiondetection, bool collision_removal,
+               bool vertical, const std::string &texture);

 
 

-       void spawnParticleAll(v3f pos, v3f velocity, v3f acceleration,
-               float expirationtime, float size,
-               bool collisiondetection, bool vertical, const std::string &texture);
-
-       u32 addParticleSpawner(const char *playername,
-               u16 amount, float spawntime,
+       u32 addParticleSpawner(u16 amount, float spawntime,

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

-               bool collisiondetection, bool vertical, const std::string &texture);
+               bool collisiondetection, bool collision_removal,
+               ServerActiveObject *attached,
+               bool vertical, const std::string &texture,
+               const std::string &playername);

 
 

-       u32 addParticleSpawnerAll(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 vertical, const std::string &texture);
-
-       void deleteParticleSpawner(const char *playername, u32 id);
-       void deleteParticleSpawnerAll(u32 id);
+       void deleteParticleSpawner(const std::string &playername, u32 id);

 
        // Creates or resets inventory
 
        // Creates or resets inventory

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

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


@@ -322,11 +298,11 @@ public:
        IWritableNodeDefManager* getWritableNodeDefManager();
        IWritableCraftDefManager* getWritableCraftDefManager();
 
        IWritableNodeDefManager* getWritableNodeDefManager();
        IWritableCraftDefManager* getWritableCraftDefManager();
 

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

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

-       inline std::string getWorldPath() const
-                       { return m_path_world; }
+       inline std::string getWorldPath() const { return m_path_world; }

 
        inline bool isSingleplayer()
                        { return m_simple_singleplayer_mode; }
 
        inline bool isSingleplayer()
                        { return m_simple_singleplayer_mode; }


@@ -338,34 +314,40 @@ public:
        Map & getMap() { return m_env->getMap(); }
        ServerEnvironment & getEnv() { return *m_env; }
 
        Map & getMap() { return m_env->getMap(); }
        ServerEnvironment & getEnv() { return *m_env; }
 

-       u32 hudAdd(Player *player, HudElement *element);
-       bool hudRemove(Player *player, u32 id);
-       bool hudChange(Player *player, u32 id, HudElementStat stat, void *value);
-       bool hudSetFlags(Player *player, u32 flags, u32 mask);
-       bool hudSetHotbarItemcount(Player *player, s32 hotbar_itemcount);
-       s32 hudGetHotbarItemcount(Player *player);
-       void hudSetHotbarImage(Player *player, std::string name);
-       std::string hudGetHotbarImage(Player *player);
-       void hudSetHotbarSelectedImage(Player *player, std::string name);
-       std::string hudGetHotbarSelectedImage(Player *player);
+       u32 hudAdd(RemotePlayer *player, HudElement *element);
+       bool hudRemove(RemotePlayer *player, u32 id);
+       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();
+       }

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

-       bool setLocalPlayerAnimations(Player *player, v2s32 animation_frames[4], f32 frame_speed);
-       bool setPlayerEyeOffset(Player *player, v3f first, v3f third);
+       bool setLocalPlayerAnimations(RemotePlayer *player, v2s32 animation_frames[4],
+                       f32 frame_speed);
+       bool setPlayerEyeOffset(RemotePlayer *player, v3f first, v3f third);

 
 

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

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

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

 
        /* con::PeerHandler implementation. */
        void peerAdded(con::Peer *peer);
        void deletingPeer(con::Peer *peer, bool timeout);
 
        void DenySudoAccess(u16 peer_id);
 
        /* con::PeerHandler implementation. */
        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,
+               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);
        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);


@@ -374,6 +356,8 @@ public:
                        u8* ser_vers, u16* prot_vers, u8* major, u8* minor, u8* patch,
                        std::string* vers_string);
 
                        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 SendPlayerBreath(u16 peer_id);
        void SendInventory(PlayerSAO* playerSAO);
        void SendPlayerHPOrDie(PlayerSAO *player);
        void SendPlayerBreath(u16 peer_id);
        void SendInventory(PlayerSAO* playerSAO);


@@ -382,6 +366,9 @@ public:
        // Bind address
        Address m_bind_addr;
 
        // Bind address
        Address m_bind_addr;
 

+       // Environment mutex (envlock)
+       Mutex m_env_mutex;
+

 private:
 
        friend class EmergeThread;
 private:
 
        friend class EmergeThread;


@@ -390,7 +377,8 @@ private:
        void SendMovement(u16 peer_id);
        void SendHP(u16 peer_id, u8 hp);
        void SendBreath(u16 peer_id, u16 breath);
        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, const std::string &custom_reason);
+       void SendAccessDenied(u16 peer_id, AccessDeniedCode reason,
+               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 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);


@@ -452,7 +440,9 @@ private:
                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 vertical, std::string texture, u32 id);
+               bool collisiondetection, bool collision_removal,
+               u16 attached_id,
+               bool vertical, const std::string &texture, u32 id);

 
        void SendDeleteParticleSpawner(u16 peer_id, u32 id);
 
 
        void SendDeleteParticleSpawner(u16 peer_id, u32 id);
 


@@ -460,7 +450,8 @@ private:
        void SendSpawnParticle(u16 peer_id,
                v3f pos, v3f velocity, v3f acceleration,
                float expirationtime, float size,
        void SendSpawnParticle(u16 peer_id,
                v3f pos, v3f velocity, v3f acceleration,
                float expirationtime, float size,

-               bool collisiondetection, bool vertical, std::string texture);
+               bool collisiondetection, bool collision_removal,
+               bool vertical, const std::string &texture);

 
        u32 SendActiveObjectRemoveAdd(u16 peer_id, const std::string &datas);
        void SendActiveObjectMessages(u16 peer_id, const std::string &datas, bool reliable = true);
 
        u32 SendActiveObjectRemoveAdd(u16 peer_id, const std::string &datas);
        void SendActiveObjectMessages(u16 peer_id, const std::string &datas, bool reliable = true);


@@ -471,7 +462,16 @@ private:
        void DiePlayer(u16 peer_id);
        void RespawnPlayer(u16 peer_id);
        void DeleteClient(u16 peer_id, ClientDeletionReason reason);
        void DiePlayer(u16 peer_id);
        void RespawnPlayer(u16 peer_id);
        void DeleteClient(u16 peer_id, ClientDeletionReason reason);

-       void UpdateCrafting(Player *player);
+       void UpdateCrafting(RemotePlayer *player);
+
+       void handleChatInterfaceEvent(ChatEvent *evt);
+
+       // This returns the answer to the sender of wmessage, or "" if there is none
+       std::wstring handleChat(const std::string &name, const std::wstring &wname,
+               const std::wstring &wmessage,
+               bool check_shout_priv = false,
+               RemotePlayer *player = NULL);
+       void handleAdminChat(const ChatEventChat *evt);

 
        v3f findSpawnPos();
 
 
        v3f findSpawnPos();
 


@@ -490,7 +490,7 @@ private:
 
                Call with env and con locked.
        */
 
                Call with env and con locked.
        */

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

 
        void handlePeerChanges();
 
 
        void handlePeerChanges();
 


@@ -505,6 +505,7 @@ private:
        // If true, do not allow multiple players and hide some multiplayer
        // functionality
        bool m_simple_singleplayer_mode;
        // If true, do not allow multiple players and hide some multiplayer
        // functionality
        bool m_simple_singleplayer_mode;

+       u16 m_max_chatmessage_length;

 
        // Thread can set; step() will throw as ServerError
        MutexedVariable<std::string> m_async_fatal_error;
 
        // Thread can set; step() will throw as ServerError
        MutexedVariable<std::string> m_async_fatal_error;


@@ -512,16 +513,13 @@ private:
        // Some timers
        float m_liquid_transform_timer;
        float m_liquid_transform_every;
        // Some timers
        float m_liquid_transform_timer;
        float m_liquid_transform_every;

-       float m_print_info_timer;

        float m_masterserver_timer;
        float m_masterserver_timer;

-       float m_objectdata_timer;

        float m_emergethread_trigger_timer;
        float m_savemap_timer;
        IntervalLimiter m_map_timer_and_unload_interval;
 
        // Environment
        ServerEnvironment *m_env;
        float m_emergethread_trigger_timer;
        float m_savemap_timer;
        IntervalLimiter m_map_timer_and_unload_interval;
 
        // Environment
        ServerEnvironment *m_env;

-       JMutex m_env_mutex;

 
        // server connection
        con::Connection m_con;
 
        // server connection
        con::Connection m_con;


@@ -562,7 +560,7 @@ private:
        // A buffer for time steps
        // step() increments and AsyncRunStep() run by m_thread reads it.
        float m_step_dtime;
        // A buffer for time steps
        // step() increments and AsyncRunStep() run by m_thread reads it.
        float m_step_dtime;

-       JMutex m_step_dtime_mutex;
+       Mutex m_step_dtime_mutex;

 
        // current server step lag counter
        float m_lag;
 
        // current server step lag counter
        float m_lag;


@@ -596,6 +594,11 @@ private:
        */
 
        bool m_shutdown_requested;
        */
 
        bool m_shutdown_requested;

+       std::string m_shutdown_msg;
+       bool m_shutdown_ask_reconnect;
+
+       ChatInterface *m_admin_chat;
+       std::string m_admin_nick;

 
        /*
                Map edit event queue. Automatically receives all map edits.
 
        /*
                Map edit event queue. Automatically receives all map edits.


@@ -632,12 +635,12 @@ private:
        u16 m_ignore_map_edit_events_peer_id;
 
        // media files known to server
        u16 m_ignore_map_edit_events_peer_id;
 
        // media files known to server

-       std::map<std::string,MediaInfo> m_media;
+       UNORDERED_MAP<std::string, MediaInfo> m_media;

 
        /*
                Sounds
        */
 
        /*
                Sounds
        */

-       std::map<s32, ServerPlayingSound> m_playing_sounds;
+       UNORDERED_MAP<s32, ServerPlayingSound> m_playing_sounds;

        s32 m_next_sound_id;
 
        /*
        s32 m_next_sound_id;
 
        /*


@@ -645,19 +648,18 @@ private:
        */
        // key = name
        std::map<std::string, Inventory*> m_detached_inventories;
        */
        // key = name
        std::map<std::string, Inventory*> m_detached_inventories;

+       // value = "" (visible to all players) or player name
+       std::map<std::string, std::string> m_detached_inventories_player;

 
 

-       /*
-               Particles
-       */
-       std::vector<u32> m_particlespawner_ids;
+       DISABLE_CLASS_COPY(Server);

 };
 
 /*
        Runs a simple dedicated server loop.
 
 };
 
 /*
        Runs a simple dedicated server loop.
 

-       Shuts down when run is set to false.
+       Shuts down when kill is set to true.

 */
 */

-void dedicated_server_loop(Server &server, bool &run);
+void dedicated_server_loop(Server &server, bool &kill);

 
 #endif
 
 
 #endif