X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fserverenvironment.h;h=a11c814ed1e9e3a419b7eb22d3f99fad376cfe6c;hb=ed0882fd58fb0f663cc115d23a11643874facc06;hp=b8a35f7fdadd75c878c5ebeec2f63904a502975e;hpb=ad7daf7b52348e1b71aa803be10de5b2134cba11;p=minetest.git diff --git a/src/serverenvironment.h b/src/serverenvironment.h index b8a35f7fd..a11c814ed 100644 --- 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 +#include class IGameDef; class ServerMap; @@ -32,6 +34,7 @@ struct GameParams; class MapBlock; class RemotePlayer; class PlayerDatabase; +class AuthDatabase; class PlayerSAO; class ServerEnvironment; class ActiveBlockModifier; @@ -154,8 +157,9 @@ class LBMManager class ActiveBlockList { public: - void update(std::vector &active_positions, - s16 radius, + void update(std::vector &active_players, + s16 active_block_range, + s16 active_object_range, std::set &blocks_removed, std::set &blocks_added); @@ -168,6 +172,7 @@ class ActiveBlockList } std::set m_list; + std::set m_abm_list; std::set m_forceloaded_list; private: @@ -185,14 +190,6 @@ enum ClearObjectsMode { CLEAR_OBJECTS_MODE_QUICK, }; -/* - The server-side environment. - - This is not thread-safe. Server uses an environment mutex. -*/ - -typedef std::unordered_map ServerActiveObjectMap; - class ServerEnvironment : public Environment { public: @@ -217,7 +214,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); @@ -230,9 +227,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); @@ -243,7 +237,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. @@ -284,9 +281,9 @@ class ServerEnvironment : public Environment /* Get the next message emitted by some active object. - Returns a message with id=0 if no messages are available. + Returns false if no messages are available, true otherwise. */ - ActiveObjectMessage getActiveObjectMessage(); + bool getActiveObjectMessage(ActiveObjectMessage *dest); virtual void getSelectedActiveObjects( const core::line3d &shootline_on_map, @@ -317,8 +314,22 @@ class ServerEnvironment : public Environment bool removeNode(v3s16 p); bool swapNode(v3s16 p, const MapNode &n); + // Find the daylight value at pos with a Depth First Search + u8 findSunlight(v3s16 pos) const; + // Find all active objects inside a radius around a point - void getObjectsInsideRadius(std::vector &objects, v3f pos, float radius); + void getObjectsInsideRadius(std::vector &objects, const v3f &pos, float radius, + std::function include_obj_cb) + { + return m_ao_manager.getObjectsInsideRadius(pos, radius, objects, include_obj_cb); + } + + // Find all active objects inside a box + void getObjectsInArea(std::vector &objects, const aabb3f &box, + std::function include_obj_cb) + { + return m_ao_manager.getObjectsInArea(box, objects, include_obj_cb); + } // Clear objects, loading and going through every MapBlock void clearObjects(ClearObjectsMode mode); @@ -326,9 +337,6 @@ class ServerEnvironment : public Environment // This makes stuff happen void step(f32 dtime); - //check if there's a line of sight between two positions - bool line_of_sight(v3f pos1, v3f pos2, float stepsize=1.0, v3s16 *p=NULL); - u32 getGameTime() const { return m_game_time; } void reportMaxLagEstimate(float f) { m_max_lag_estimate = f; } @@ -343,14 +351,26 @@ class ServerEnvironment : public Environment RemotePlayer *getPlayer(const session_t peer_id); RemotePlayer *getPlayer(const char* name); + const std::vector 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 ------------------------------------------- @@ -407,10 +427,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 m_active_object_messages; // Some timers @@ -421,7 +441,8 @@ 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; + // Whether the variables below have been read from file yet + bool m_meta_loaded = false; // Time from the beginning of the game in seconds. // Incremented in step(). u32 m_game_time = 0; @@ -443,9 +464,15 @@ class ServerEnvironment : public Environment std::vector 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; std::unordered_map m_particle_spawners; std::unordered_map m_particle_spawner_attachments; + + ServerActiveObject* createSAO(ActiveObjectType type, v3f pos, const std::string &data); };