Merge upstream/main into main
Brings in dedicated server software, README updates, and .vscode cleanup while preserving hardcore mode, screenshot, and watermark toggle features.
This commit is contained in:
@@ -44,6 +44,7 @@ typedef struct _NetworkGameInitData
|
||||
LevelGenerationOptions *levelGen;
|
||||
DWORD texturePackId;
|
||||
bool findSeed;
|
||||
bool dedicatedNoLocalHostPlayer;
|
||||
unsigned int xzSize;
|
||||
unsigned char hellScale;
|
||||
ESavePlatform savePlatform;
|
||||
@@ -57,6 +58,7 @@ typedef struct _NetworkGameInitData
|
||||
levelGen = nullptr;
|
||||
texturePackId = 0;
|
||||
findSeed = false;
|
||||
dedicatedNoLocalHostPlayer = false;
|
||||
xzSize = LEVEL_LEGACY_WIDTH;
|
||||
hellScale = HELL_LEVEL_LEGACY_SCALE;
|
||||
savePlatform = SAVE_FILE_PLATFORM_LOCAL;
|
||||
@@ -119,6 +121,7 @@ public:
|
||||
int maxBuildHeight;
|
||||
int playerIdleTimeout;
|
||||
bool forceGameType;
|
||||
int m_spawnProtectionRadius;
|
||||
|
||||
private:
|
||||
// 4J Added
|
||||
|
||||
Reference in New Issue
Block a user