diff --git a/engine/server/library/serverScript/src/shared/JavaLibrary.cpp b/engine/server/library/serverScript/src/shared/JavaLibrary.cpp index b084a299..75f83e68 100755 --- a/engine/server/library/serverScript/src/shared/JavaLibrary.cpp +++ b/engine/server/library/serverScript/src/shared/JavaLibrary.cpp @@ -1149,8 +1149,6 @@ void JavaLibrary::initializeJavaThread() JNIEnv * env = nullptr; jint result = (*JNI_CreateJavaVMProc)(&ms_jvm, reinterpret_cast(&env), &vm_args); - Os::sleep(100); - if (result != 0) { FATAL(true, ("Failed to CreateJavaVMProc: %d", result)); diff --git a/engine/shared/library/sharedFoundationTypes/src/linux/FoundationTypesLinux.h b/engine/shared/library/sharedFoundationTypes/src/linux/FoundationTypesLinux.h index 386c4ffb..bd4bdc9d 100755 --- a/engine/shared/library/sharedFoundationTypes/src/linux/FoundationTypesLinux.h +++ b/engine/shared/library/sharedFoundationTypes/src/linux/FoundationTypesLinux.h @@ -10,6 +10,7 @@ #define PLATFORM_LINUX #include +#include // ====================================================================== // basic types that we assume to be around @@ -20,8 +21,8 @@ typedef unsigned long uint32; typedef signed char int8; typedef signed short int16; typedef signed long int32; -typedef signed long long int int64; -typedef unsigned long long int uint64; +typedef int64_t int64; +typedef uint64_t uint64; typedef float real; typedef FILE* FILE_HANDLE; diff --git a/game/server/database/updates/270.sql b/game/server/database/updates/270.sql index cb50d9e2..919fbc19 100644 --- a/game/server/database/updates/270.sql +++ b/game/server/database/updates/270.sql @@ -1 +1,11 @@ +CREATE TABLE "ACCOUNT_MAP" +( + "PARENT_ID" NUMBER(38,0) NOT NULL ENABLE, + "CHILD_ID" NUMBER(38,0) NOT NULL ENABLE, + CONSTRAINT "ACCOUNT_MAP_UK1" UNIQUE ("CHILD_ID", "PARENT_ID") USING INDEX (CREATE INDEX "ACCOUNT_MAP_INDEX2" ON "ACCOUNT_MAP" ("CHILD_ID","PARENT_ID")), + CONSTRAINT "ACCOUNT_MAP_UK2" UNIQUE ("CHILD_ID") USING INDEX (CREATE INDEX "ACCOUNT_MAP_INDEX1" ON "ACCOUNT_MAP" ("CHILD_ID")), + CONSTRAINT "ACCOUNT_MAP_FK1" FOREIGN KEY ("PARENT_ID") REFERENCES "ACCOUNTS" ("STATION_ID"), + CONSTRAINT "ACCOUNT_MAP_FK2" FOREIGN KEY ("CHILD_ID") REFERENCES "ACCOUNTS" ("STATION_ID") +); + update version_number set version_number=270, min_version_number=270;