This commit is contained in:
2026-07-22 23:27:50 +02:00
parent 67acd7f9a6
commit f6377bc5a2
5 changed files with 13 additions and 11 deletions

View File

@@ -6,7 +6,7 @@ include(cmake/CPM.cmake)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED TRUE) set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
set(CMAKE_POLICY_VERSION_MINIMUM 3.10) set(CMAKE_POLICY_VERSION_MINIMUM 3.10)
add_definitions(-DLUA_USE_DLOPEN)
include(cmake/EnumOption.cmake) include(cmake/EnumOption.cmake)
if(EMSCRIPTEN) if(EMSCRIPTEN)
@@ -352,7 +352,7 @@ endif()
# Server # Server
add_executable("${PROJECT_NAME}-server" ${SERVER_SOURCES}) add_executable("${PROJECT_NAME}-server" ${SERVER_SOURCES})
set_target_properties("${PROJECT_NAME}-server" PROPERTIES ENABLE_EXPORTS TRUE)
target_compile_definitions("${PROJECT_NAME}-server" PUBLIC "STANDALONE_SERVER" "SERVER_PROFILER") target_compile_definitions("${PROJECT_NAME}-server" PUBLIC "STANDALONE_SERVER" "SERVER_PROFILER")
target_include_directories("${PROJECT_NAME}-server" PUBLIC target_include_directories("${PROJECT_NAME}-server" PUBLIC
@@ -365,6 +365,7 @@ target_include_directories("${PROJECT_NAME}-server" PUBLIC
target_link_libraries("${PROJECT_NAME}-server" ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_LIBS} lua sol2::sol2) target_link_libraries("${PROJECT_NAME}-server" ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_LIBS} lua sol2::sol2)
add_executable(${PROJECT_NAME} ${CLIENT_SOURCES}) add_executable(${PROJECT_NAME} ${CLIENT_SOURCES})
set_target_properties(${PROJECT_NAME} PROPERTIES ENABLE_EXPORTS TRUE)
target_compile_definitions(${PROJECT_NAME} PUBLIC ${PLATFORM_CPP}) target_compile_definitions(${PROJECT_NAME} PUBLIC ${PLATFORM_CPP})

View File

@@ -142,8 +142,8 @@ void seedMT( unsigned int seed, unsigned int *state, unsigned int *&next, int &l
// so-- that's why the only change I made is to restrict to odd seeds. // so-- that's why the only change I made is to restrict to odd seeds.
// //
register unsigned int x = ( seed | 1U ) & 0xFFFFFFFFU, *s = state; unsigned int x = ( seed | 1U ) & 0xFFFFFFFFU, *s = state;
register int j; int j;
for ( left = 0, *s++ = x, j = N; --j; for ( left = 0, *s++ = x, j = N; --j;
*s++ = ( x *= 69069U ) & 0xFFFFFFFFU ) *s++ = ( x *= 69069U ) & 0xFFFFFFFFU )
@@ -154,8 +154,8 @@ void seedMT( unsigned int seed, unsigned int *state, unsigned int *&next, int &l
unsigned int reloadMT( unsigned int *state, unsigned int *&next, int &left ) unsigned int reloadMT( unsigned int *state, unsigned int *&next, int &left )
{ {
register unsigned int * p0 = state, *p2 = state + 2, *pM = state + M, s0, s1; unsigned int * p0 = state, *p2 = state + 2, *pM = state + M, s0, s1;
register int j; int j;
if ( left < -1 ) if ( left < -1 )
seedMT( 4357U ); seedMT( 4357U );

View File

@@ -240,6 +240,7 @@ int main(int numArguments, char* pszArgs[]) {
delete app; delete app;
appContext.platform->finish(); appContext.platform->finish();
delete appContext.platform; delete appContext.platform;
PluginsManager::get().emit("ServerShutdown");
std::cout << "Quit correctly" << std::endl; std::cout << "Quit correctly" << std::endl;
return g_exitCode; return g_exitCode;

View File

@@ -8,7 +8,7 @@
namespace fs = std::filesystem; namespace fs = std::filesystem;
void PluginsManager::init(Minecraft& minecraft) { void PluginsManager::init(Minecraft& minecraft) {
m_lua.open_libraries(sol::lib::base); m_lua.open_libraries(sol::lib::base, sol::lib::package, sol::lib::string, sol::lib::math, sol::lib::table);
registerTypes(); registerTypes();
m_minecraft = &minecraft; m_minecraft = &minecraft;

View File

@@ -142,8 +142,8 @@ void seedMT( unsigned int seed, unsigned int *state, unsigned int *&next, int &l
// so-- that's why the only change I made is to restrict to odd seeds. // so-- that's why the only change I made is to restrict to odd seeds.
// //
register unsigned int x = ( seed | 1U ) & 0xFFFFFFFFU, *s = state; unsigned int x = ( seed | 1U ) & 0xFFFFFFFFU, *s = state;
register int j; int j;
for ( left = 0, *s++ = x, j = N; --j; for ( left = 0, *s++ = x, j = N; --j;
*s++ = ( x *= 69069U ) & 0xFFFFFFFFU ) *s++ = ( x *= 69069U ) & 0xFFFFFFFFU )
@@ -154,8 +154,8 @@ void seedMT( unsigned int seed, unsigned int *state, unsigned int *&next, int &l
unsigned int reloadMT( unsigned int *state, unsigned int *&next, int &left ) unsigned int reloadMT( unsigned int *state, unsigned int *&next, int &left )
{ {
register unsigned int * p0 = state, *p2 = state + 2, *pM = state + M, s0, s1; unsigned int * p0 = state, *p2 = state + 2, *pM = state + M, s0, s1;
register int j; int j;
if ( left < -1 ) if ( left < -1 )
seedMT( 4357U ); seedMT( 4357U );