mirror of
https://github.com/luanti-org/luanti.git
synced 2026-01-13 12:45:29 +01:00
Break include chains and tidy (#16640)
Co-authored-by: cx384 <cx384@proton.me>
This commit is contained in:
100
src/server.cpp
100
src/server.cpp
@@ -3,64 +3,69 @@
|
||||
// Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
|
||||
|
||||
#include "server.h"
|
||||
|
||||
#include "chat_interface.h"
|
||||
#include "chatmessage.h"
|
||||
#include "config.h"
|
||||
#include "constants.h"
|
||||
#include "content_nodemeta.h"
|
||||
#include "craftdef.h"
|
||||
#include "environment.h"
|
||||
#include "filesys.h"
|
||||
#include "gameparams.h"
|
||||
#include "gettext.h"
|
||||
#include "irr_v2d.h"
|
||||
#include "itemdef.h"
|
||||
#include "log.h"
|
||||
#include "mapblock.h"
|
||||
#include "nodedef.h"
|
||||
#include "particles.h"
|
||||
#include "profiler.h"
|
||||
#include "remoteplayer.h"
|
||||
#include "server/ban.h"
|
||||
#include "servermap.h"
|
||||
#include "server/player_sao.h"
|
||||
#include "server/rollback.h"
|
||||
#include "server/serveractiveobject.h"
|
||||
#include "server/serverinventorymgr.h"
|
||||
#include "server/serverlist.h"
|
||||
#include "settings.h"
|
||||
#include "translation.h"
|
||||
#include "util/base64.h"
|
||||
#include "util/hashing.h"
|
||||
#include "util/hex.h"
|
||||
#include "util/serialize.h"
|
||||
#include "util/string.h"
|
||||
#include "util/thread.h"
|
||||
#include "util/tracy_wrapper.h"
|
||||
#include "version.h"
|
||||
|
||||
// Mapgen
|
||||
#include "emerge.h"
|
||||
#include "mapgen/mapgen.h"
|
||||
#include "mapgen/mg_biome.h"
|
||||
|
||||
// Modding
|
||||
#include "modchannels.h"
|
||||
#include "script/common/c_types.h" // LuaError
|
||||
#include "scripting_server.h"
|
||||
#include "server/mods.h" // ServerModManager
|
||||
|
||||
// Network
|
||||
#include "network/connection.h"
|
||||
#include "network/networkpacket.h"
|
||||
#include "network/networkprotocol.h"
|
||||
#include "network/serveropcodes.h"
|
||||
#include "server/ban.h"
|
||||
#include "environment.h"
|
||||
#include "servermap.h"
|
||||
#include "threading/mutex_auto_lock.h"
|
||||
#include "constants.h"
|
||||
#include "voxel.h"
|
||||
#include "config.h"
|
||||
#include "version.h"
|
||||
#include "filesys.h"
|
||||
#include "mapblock.h"
|
||||
#include "server/serveractiveobject.h"
|
||||
#include "serialization.h" // SER_FMT_VER_INVALID
|
||||
#include "settings.h"
|
||||
#include "profiler.h"
|
||||
#include "log.h"
|
||||
#include "scripting_server.h"
|
||||
#include "nodedef.h"
|
||||
#include "itemdef.h"
|
||||
#include "craftdef.h"
|
||||
#include "emerge.h"
|
||||
#include "mapgen/mapgen.h"
|
||||
#include "mapgen/mg_biome.h"
|
||||
#include "content_mapnode.h"
|
||||
#include "content_nodemeta.h"
|
||||
#include "content/mods.h"
|
||||
#include "modchannels.h"
|
||||
#include "server/serverlist.h"
|
||||
#include "util/string.h"
|
||||
#include "server/rollback.h"
|
||||
#include "util/serialize.h"
|
||||
#include "util/thread.h"
|
||||
#include "defaultsettings.h"
|
||||
#include "server/mods.h"
|
||||
#include "util/base64.h"
|
||||
#include "util/hashing.h"
|
||||
#include "util/hex.h"
|
||||
|
||||
// Database
|
||||
#include "database/database.h"
|
||||
#include "chatmessage.h"
|
||||
#include "chat_interface.h"
|
||||
#include "remoteplayer.h"
|
||||
#include "server/player_sao.h"
|
||||
#include "server/serverinventorymgr.h"
|
||||
#include "translation.h"
|
||||
#include "database/database-sqlite3.h"
|
||||
#if USE_POSTGRESQL
|
||||
#include "database/database-postgresql.h"
|
||||
#endif
|
||||
#include "database/database-files.h"
|
||||
#include "database/database-dummy.h"
|
||||
#include "gameparams.h"
|
||||
#include "particles.h"
|
||||
#include "gettext.h"
|
||||
#include "util/tracy_wrapper.h"
|
||||
|
||||
#include <iostream>
|
||||
#include <queue>
|
||||
@@ -3990,6 +3995,11 @@ void Server::setAsyncFatalError(const std::string &error)
|
||||
m_thread->stop();
|
||||
}
|
||||
|
||||
void Server::setAsyncFatalError(const LuaError &e)
|
||||
{
|
||||
setAsyncFatalError(std::string("Lua: ") + e.what());
|
||||
}
|
||||
|
||||
// Not thread-safe.
|
||||
void Server::addShutdownError(const ModError &e)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user