Clean up stack after script_get_backtrace (#7854)

[dragonfireclient.git] / src / script / scripting_server.h

diff --git a/src/script/scripting_server.h b/src/script/scripting_server.h
index 1b335406e77e9bf4394544bf225013ce96c208ac..88cea143ca227d1692a1cfffc02fbed55636409e 100644 (file)
--- a/src/script/scripting_server.h
+++ b/src/script/scripting_server.h
@@ -17,18 +17,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef SERVER_SCRIPTING_H_
-#define SERVER_SCRIPTING_H_
-
+#pragma once
 #include "cpp_api/s_base.h"
 #include "cpp_api/s_entity.h"
 #include "cpp_api/s_env.h"
 #include "cpp_api/s_inventory.h"
+#include "cpp_api/s_modchannels.h"
 #include "cpp_api/s_node.h"
 #include "cpp_api/s_player.h"
 #include "cpp_api/s_server.h"
 #include "cpp_api/s_security.h"
-#include "util/basic_macros.h"
 
 /*****************************************************************************/
 /* Scripting <-> Server Game Interface                                       */
@@ -39,6 +37,7 @@ class ServerScripting:
                public ScriptApiDetached,
                public ScriptApiEntity,
                public ScriptApiEnv,
+               public ScriptApiModChannels,
                public ScriptApiNode,
                public ScriptApiPlayer,
                public ScriptApiServer,
@@ -51,9 +50,6 @@ class ServerScripting:
 
 private:
        void InitializeModApi(lua_State *L, int top);
-       DISABLE_CLASS_COPY(ServerScripting);
 };
 
 void log_deprecated(const std::string &message);
-
-#endif /* SCRIPTING_GAME_H_ */