summaryrefslogtreecommitdiffstats
path: root/src/Server.h
diff options
context:
space:
mode:
authorAlexander Harkness <me@bearbin.net>2024-11-02 22:27:47 +0100
committerAlexander Harkness <me@bearbin.net>2024-11-02 22:27:47 +0100
commitcb50ec10591c0e0e4b9915e642bc50d3d8d1fd0a (patch)
treef647b20e1823f1846af88e832cf82a4a02e96e69 /src/Server.h
parentImprove clang-format config file, remove automatically enforced code style from contrib guide. (diff)
downloadcuberite-clang-format-codebase.tar
cuberite-clang-format-codebase.tar.gz
cuberite-clang-format-codebase.tar.bz2
cuberite-clang-format-codebase.tar.lz
cuberite-clang-format-codebase.tar.xz
cuberite-clang-format-codebase.tar.zst
cuberite-clang-format-codebase.zip
Diffstat (limited to 'src/Server.h')
-rw-r--r--src/Server.h37
1 files changed, 15 insertions, 22 deletions
diff --git a/src/Server.h b/src/Server.h
index 171d68d48..55d720c2c 100644
--- a/src/Server.h
+++ b/src/Server.h
@@ -14,18 +14,18 @@
#include "OSSupport/Network.h"
#ifdef _MSC_VER
- #pragma warning(push)
- #pragma warning(disable:4127)
- #pragma warning(disable:4244)
- #pragma warning(disable:4231)
- #pragma warning(disable:4189)
- #pragma warning(disable:4702)
+#pragma warning(push)
+#pragma warning(disable : 4127)
+#pragma warning(disable : 4244)
+#pragma warning(disable : 4231)
+#pragma warning(disable : 4189)
+#pragma warning(disable : 4702)
#endif
#include "mbedTLS++/RsaPrivateKey.h"
#ifdef _MSC_VER
- #pragma warning(pop)
+#pragma warning(pop)
#endif
@@ -44,7 +44,7 @@ class cUUID;
namespace Json
{
- class Value;
+class Value;
}
@@ -54,7 +54,7 @@ namespace Json
// tolua_begin
class cServer
{
-public:
+ public:
// tolua_end
virtual ~cServer() {}
@@ -62,7 +62,7 @@ public:
// tolua_begin
- const AString & GetDescription(void) const {return m_Description; }
+ const AString & GetDescription(void) const { return m_Description; }
const AString & GetShutdownMessage(void) const { return m_ShutdownMessage; }
@@ -165,29 +165,26 @@ public:
/** Get the Forge mods (map of ModName -> ModVersionString) registered for a given protocol. */
const AStringMap & GetRegisteredForgeMods(const UInt32 a_Protocol);
-private:
-
+ private:
friend class cRoot; // so cRoot can create and destroy cServer
friend class cServerListenCallbacks; // Accessing OnConnectionAccepted()
/** The server tick thread takes care of the players who aren't yet spawned in a world */
- class cTickThread:
- public cIsThread
+ class cTickThread : public cIsThread
{
using Super = cIsThread;
- public:
-
+ public:
cTickThread(cServer & a_Server);
- protected:
+ protected:
cServer & m_Server;
// cIsThread overrides:
virtual void Execute(void) override;
- } ;
+ };
@@ -306,7 +303,3 @@ private:
}; // tolua_export
-
-
-
-