aboutsummaryrefslogtreecommitdiff
path: root/src/script/scripting_server.h
diff options
context:
space:
mode:
authorElias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com>2020-11-04 16:57:47 +0100
committerGitHub <noreply@github.com>2020-11-04 16:57:47 +0100
commit3e16c3a78fff61c20e63ba730d15e94e3bb877b4 (patch)
treec070350db219f2c4241d22bc31949685c7b42fe9 /src/script/scripting_server.h
parent5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (diff)
parent6ccb5835ff55d85156be91473c598eca9d6cb9a6 (diff)
downloaddragonfireclient-3e16c3a78fff61c20e63ba730d15e94e3bb877b4.tar.xz
Merge branch 'master' into master
Diffstat (limited to 'src/script/scripting_server.h')
-rw-r--r--src/script/scripting_server.h21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/script/scripting_server.h b/src/script/scripting_server.h
index b0619f449..bf06ab197 100644
--- a/src/script/scripting_server.h
+++ b/src/script/scripting_server.h
@@ -32,18 +32,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
/* Scripting <-> Server Game Interface */
/*****************************************************************************/
-class ServerScripting : virtual public ScriptApiBase,
- public ScriptApiDetached,
- public ScriptApiEntity,
- public ScriptApiEnv,
- public ScriptApiModChannels,
- public ScriptApiNode,
- public ScriptApiPlayer,
- public ScriptApiServer,
- public ScriptApiSecurity
+class ServerScripting:
+ virtual public ScriptApiBase,
+ public ScriptApiDetached,
+ public ScriptApiEntity,
+ public ScriptApiEnv,
+ public ScriptApiModChannels,
+ public ScriptApiNode,
+ public ScriptApiPlayer,
+ public ScriptApiServer,
+ public ScriptApiSecurity
{
public:
- ServerScripting(Server *server);
+ ServerScripting(Server* server);
// use ScriptApiBase::loadMod() to load mods