Merge pull request #8 from sylvessa/fix/random-fixes

Fix flight, entity ids, chunk loading speeds, and autosave ui for dedi removal

Minecraft.Client/MinecraftServer.cpp

@@ -657,7 +657,7 @@ bool MinecraftServer::initServer(int64_t seed, NetworkGameInitData *initData, DW
 	setFlightAllowed(GetDedicatedServerBool(settings, L"allow-flight", true));
 
 	// 4J Stu - Enabling flight to stop it kicking us when we use it
-#ifdef _DEBUG_MENUS_ENABLED
+#if (defined _DEBUG_MENUS_ENABLED && defined _DEBUG)
 	setFlightAllowed(true);
 #endif
 
@@ -1848,8 +1848,9 @@ void MinecraftServer::run(int64_t seed, void *lpParameter)
 				switch(eAction)
                 {
                 case eXuiServerAction_AutoSaveGame:
-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(MINECRAFT_SERVER_BUILD)
                     {
+#if defined(_XBOX_ONE) || defined(__ORBIS__)
                         PIXBeginNamedEvent(0, "Autosave");
 
                         // Get the frequency of the timer
@@ -1860,6 +1861,7 @@ void MinecraftServer::run(int64_t seed, void *lpParameter)
 
                         // Save the start time
                         QueryPerformanceCounter(&qwTime);
+#endif
 
                         if (players != nullptr)
                         {
@@ -1873,26 +1875,39 @@ void MinecraftServer::run(int64_t seed, void *lpParameter)
                             // with the data from the nethers leveldata.
                             // Fix for #7418 - Functional: Gameplay: Saving after sleeping in a bed will place player at nighttime when restarting.
                             ServerLevel *level = levels[levels.length - 1 - j];
+#if defined(_XBOX_ONE) || defined(__ORBIS__)
                             PIXBeginNamedEvent(0, "Saving level %d", levels.length - 1 - j);
+#endif
                             level->save(false, nullptr, true);
+#if defined(_XBOX_ONE) || defined(__ORBIS__)
                             PIXEndNamedEvent();
+#endif
                         }
                         if (!s_bServerHalted)
                         {
+#if defined(_XBOX_ONE) || defined(__ORBIS__)
                             PIXBeginNamedEvent(0, "Saving game rules");
+#endif
                             saveGameRules();
+#if defined(_XBOX_ONE) || defined(__ORBIS__)
                             PIXEndNamedEvent();
 
                             PIXBeginNamedEvent(0, "Save to disc");
+#endif
                             levels[0]->saveToDisc(Minecraft::GetInstance()->progressRenderer, true);
+#if defined(_XBOX_ONE) || defined(__ORBIS__)
                             PIXEndNamedEvent();
+#endif
                         }
+
+#if defined(_XBOX_ONE) || defined(__ORBIS__)
                         PIXEndNamedEvent();
 
                         QueryPerformanceCounter(&qwNewTime);
                         qwDeltaTime.QuadPart = qwNewTime.QuadPart - qwTime.QuadPart;
                         fElapsedTime = fSecsPerTick * ((FLOAT)(qwDeltaTime.QuadPart));
                         app.DebugPrintf("Autosave: Elapsed time %f\n", fElapsedTime);
+#endif
                     }
                     break;
 #endif
@@ -2375,6 +2390,9 @@ bool MinecraftServer::chunkPacketManagement_CanSendTo(INetworkPlayer *player)
 {
 	if( player == nullptr ) return false;
 
+#ifdef MINECRAFT_SERVER_BUILD
+	return true;
+#else
 	int time = GetTickCount();
 	DWORD currentPlayerCount = g_NetworkManager.GetPlayerCount();
 	if( currentPlayerCount == 0 ) return false;
@@ -2386,6 +2404,7 @@ bool MinecraftServer::chunkPacketManagement_CanSendTo(INetworkPlayer *player)
 	}
 
 	return false;
+#endif
 }
 
 void MinecraftServer::chunkPacketManagement_DidSendTo(INetworkPlayer *player)

Minecraft.Client/ServerPlayer.cpp

@@ -146,7 +146,8 @@ void ServerPlayer::flagEntitiesToBeRemoved(unsigned int *flags, bool *removedFou
 	if( ( *removedFound ) == false )
 	{
 		*removedFound = true;
-		memset(flags, 0, 2048/32);
+		// before this left 192 bytes uninitialized!!!!!
+        memset(flags, 0, (2048 / 32) * sizeof(unsigned int));
 	}
 
 	for(int index : entitiesToRemove)
@@ -376,6 +377,9 @@ void ServerPlayer::doChunkSendingTick(bool dontDelayChunks)
 //						connection->done);
 //				}
 
+#ifdef MINECRAFT_SERVER_BUILD
+				if (dontDelayChunks || (canSendToPlayer && !connection->done))
+#else
 				if( dontDelayChunks ||
 					(canSendToPlayer &&
 #ifdef _XBOX_ONE
@@ -390,6 +394,7 @@ void ServerPlayer::doChunkSendingTick(bool dontDelayChunks)
 #endif
 					//(tickCount - lastBrupSendTickCount) > (connection->getNetworkPlayer()->GetCurrentRtt()>>4) &&
 					!connection->done) )
+#endif
                 {
                     lastBrupSendTickCount = tickCount;
                     okToSend = true;

Minecraft.World/Entity.cpp

@@ -96,9 +96,20 @@ int Entity::getSmallId()
 		puiUsedFlags++;
 	}
 
+#ifdef MINECRAFT_SERVER_BUILD
+	// in mc server dedi, a server with 8+ playerrs can cause this to go wack
+    int fallbackId = Entity::entityCounter++;
+
+    if (entityCounter == 0x7ffffff)
+    {
+        entityCounter = 2048;
+    }
+    return fallbackId;
+#else
 	app.DebugPrintf("Out of small entity Ids... possible leak?\n");
 	__debugbreak();
 	return -1;
+#endif
 }
 
 void Entity::countFlagsForPIX()

Minecraft.World/Level.h

@@ -16,7 +16,12 @@ using namespace std;
 
 // 4J Stu - This value should be big enough that we don't get any crashes causes by memory overwrites,
 // however it does seem way too large for what is actually needed. Needs further investigation
+#ifdef MINECRAFT_SERVER_BUILD
+// fixes a crash when 8+ players are present
+#define LEVEL_CHUNKS_TO_UPDATE_MAX (32*32*8)
+#else
 #define LEVEL_CHUNKS_TO_UPDATE_MAX (19*19*8)
+#endif
 
 class Vec3;
 class ChunkSource;