X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fserverenvironment.h;h=4b453d39a35bda885a7ca68e9fdd8335f9d6898d;hb=3d17394410f33a19c1dd9314f6d66d6fbc30bae7;hp=9d84d7a480c82108e7428211b8372fcb6cc03405;hpb=7528986e4449febead9b18b6118f0b096f7cf800;p=minetest.git diff --git a/src/serverenvironment.h b/src/serverenvironment.h index 9d84d7a48..4b453d39a 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,9 +34,11 @@ struct GameParams; class MapBlock; class RemotePlayer; class PlayerDatabase; +class AuthDatabase; class PlayerSAO; class ServerEnvironment; class ActiveBlockModifier; +struct StaticObject; class ServerActiveObject; class Server; class ServerScripting; @@ -53,10 +57,10 @@ class ActiveBlockModifier virtual ~ActiveBlockModifier() = default; // Set of contents to trigger on - virtual const std::set &getTriggerContents() const = 0; + virtual const std::vector &getTriggerContents() const = 0; // Set of required neighbors (trigger doesn't happen if none are found) // Empty = do not check neighbors - virtual const std::set &getRequiredNeighbors() const = 0; + virtual const std::vector &getRequiredNeighbors() const = 0; // Trigger interval in seconds virtual float getTriggerInterval() = 0; // Random chance of (1 / return value), 0 is disallowed @@ -153,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); @@ -167,6 +172,7 @@ class ActiveBlockList } std::set m_list; + std::set m_abm_list; std::set m_forceloaded_list; private: @@ -216,9 +222,9 @@ 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, u16 peer_id, + PlayerSAO *loadPlayer(RemotePlayer *player, bool *new_player, session_t peer_id, bool is_singleplayer); void addPlayer(RemotePlayer *player); void removePlayer(RemotePlayer *player); @@ -229,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); @@ -242,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. @@ -283,9 +289,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,7 +323,11 @@ 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 &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); + } // Clear objects, loading and going through every MapBlock void clearObjects(ClearObjectsMode mode); @@ -325,9 +335,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; } @@ -340,15 +347,28 @@ class ServerEnvironment : public Environment void setStaticForActiveObjectsInBlock(v3s16 blockpos, bool static_exists, v3s16 static_block=v3s16(0,0,0)); - RemotePlayer *getPlayer(const u16 peer_id); + 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 ------------------------------------------- @@ -367,7 +387,7 @@ class ServerEnvironment : public Environment u16 addActiveObjectRaw(ServerActiveObject *object, bool set_changed, u32 dtime_s); /* - Remove all objects that satisfy (m_removed && m_known_by_count==0) + Remove all objects that satisfy (isGone() && m_known_by_count==0) */ void removeRemovedObjects(); @@ -387,6 +407,14 @@ class ServerEnvironment : public Environment */ void deactivateFarObjects(bool force_delete); + /* + A few helpers used by the three above methods + */ + void deleteStaticFromBlock( + ServerActiveObject *obj, u16 id, u32 mod_reason, bool no_emerge); + bool saveStaticToBlock(v3s16 blockpos, u16 store_id, + ServerActiveObject *obj, const StaticObject &s_obj, u32 mod_reason); + /* Member variables */ @@ -397,10 +425,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 @@ -408,10 +436,12 @@ class ServerEnvironment : public Environment IntervalLimiter m_object_management_interval; // List of active blocks ActiveBlockList m_active_blocks; + IntervalLimiter m_database_check_interval; 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; @@ -433,9 +463,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); };