Fix potential problem with core.get_connected_players()

[minetest.git] / src / serverenvironment.h

diff --git a/src/serverenvironment.h b/src/serverenvironment.h
index ee5e8d8577a9ac41cab1edd3fe662292bac5ddc1..3c7b7d059577490d6f1be64f2348754bf2b899c5 100644 (file)
--- a/src/serverenvironment.h
+++ b/src/serverenvironment.h
@@ -23,8 +23,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "environment.h"
 #include "mapnode.h"
 #include "settings.h"
+#include "server/activeobjectmgr.h"
 #include "util/numeric.h"
 #include <set>
+#include <random>
 
 class IGameDef;
 class ServerMap;
@@ -32,6 +34,7 @@ struct GameParams;
 class MapBlock;
 class RemotePlayer;
 class PlayerDatabase;
+class AuthDatabase;
 class PlayerSAO;
 class ServerEnvironment;
 class ActiveBlockModifier;
@@ -219,7 +222,7 @@ class ServerEnvironment : public Environment
        void kickAllPlayers(AccessDeniedCode reason,
                const std::string &str_reason, bool reconnect);
        // Save players
-       void saveLoadedPlayers();
+       void saveLoadedPlayers(bool force = false);
        void savePlayer(RemotePlayer *player);
        PlayerSAO *loadPlayer(RemotePlayer *player, bool *new_player, session_t peer_id,
                bool is_singleplayer);
@@ -232,9 +235,6 @@ class ServerEnvironment : public Environment
        */
        void saveMeta();
        void loadMeta();
-       // to be called instead of loadMeta if
-       // env_meta.txt doesn't exist (e.g. new world)
-       void loadDefaultMeta();
 
        u32 addParticleSpawner(float exptime);
        u32 addParticleSpawner(float exptime, u16 attached_id);
@@ -245,7 +245,10 @@ class ServerEnvironment : public Environment
                -------------------------------------------
        */
 
-       ServerActiveObject* getActiveObject(u16 id);
+       ServerActiveObject* getActiveObject(u16 id)
+       {
+               return m_ao_manager.getActiveObject(id);
+       }
 
        /*
                Add an active object to the environment.
@@ -257,19 +260,6 @@ class ServerEnvironment : public Environment
        */
        u16 addActiveObject(ServerActiveObject *object);
 
-       /**
-        * Verify if id is a free active object id
-        * @param id
-        * @return true if slot is free
-        */
-       bool isFreeServerActiveObjectId(u16 id) const;
-
-       /**
-        * Retrieve the next free activeobject ID
-        * @return free activeobject ID or zero if not free ID found
-        */
-       u16 getFreeServerActiveObjectId();
-
        /*
                Add an active object as a static object to the corresponding
                MapBlock.
@@ -333,7 +323,10 @@ class ServerEnvironment : public Environment
        bool swapNode(v3s16 p, const MapNode &n);
 
        // Find all active objects inside a radius around a point
-       void getObjectsInsideRadius(std::vector<u16> &objects, v3f pos, float radius);
+       void getObjectsInsideRadius(std::vector<u16> &objects, const v3f &pos, float radius)
+       {
+               return m_ao_manager.getObjectsInsideRadius(pos, radius, objects);
+       }
 
        // Clear objects, loading and going through every MapBlock
        void clearObjects(ClearObjectsMode mode);
@@ -365,14 +358,26 @@ class ServerEnvironment : public Environment
 
        RemotePlayer *getPlayer(const session_t peer_id);
        RemotePlayer *getPlayer(const char* name);
+       const std::vector<RemotePlayer *> getPlayers() const { return m_players; }
        u32 getPlayerCount() const { return m_players.size(); }
 
        static bool migratePlayersDatabase(const GameParams &game_params,
                        const Settings &cmd_args);
+
+       AuthDatabase *getAuthDatabase() { return m_auth_database; }
+       static bool migrateAuthDatabase(const GameParams &game_params,
+                       const Settings &cmd_args);
 private:
 
+       /**
+        * called if env_meta.txt doesn't exist (e.g. new world)
+        */
+       void loadDefaultMeta();
+
        static PlayerDatabase *openPlayerDatabase(const std::string &name,
                        const std::string &savedir, const Settings &conf);
+       static AuthDatabase *openAuthDatabase(const std::string &name,
+                       const std::string &savedir, const Settings &conf);
        /*
                Internal ActiveObject interface
                -------------------------------------------
@@ -429,10 +434,10 @@ class ServerEnvironment : public Environment
        ServerScripting* m_script;
        // Server definition
        Server *m_server;
+       // Active Object Manager
+       server::ActiveObjectMgr m_ao_manager;
        // World path
        const std::string m_path_world;
-       // Active object list
-       ServerActiveObjectMap m_active_objects;
        // Outgoing network message buffer for active objects
        std::queue<ActiveObjectMessage> m_active_object_messages;
        // Some timers
@@ -443,7 +448,6 @@ class ServerEnvironment : public Environment
        IntervalLimiter m_active_blocks_management_interval;
        IntervalLimiter m_active_block_modifier_interval;
        IntervalLimiter m_active_blocks_nodemetadata_interval;
-       int m_active_block_interval_overload_skip = 0;
        // Time from the beginning of the game in seconds.
        // Incremented in step().
        u32 m_game_time = 0;
@@ -465,6 +469,10 @@ class ServerEnvironment : public Environment
        std::vector<RemotePlayer*> m_players;
 
        PlayerDatabase *m_player_database = nullptr;
+       AuthDatabase *m_auth_database = nullptr;
+
+       // Pseudo random generator for shuffling, etc.
+       std::mt19937 m_rgen;
 
        // Particles
        IntervalLimiter m_particle_management_interval;