Merge remote-tracking branch 'upstream/main'

2026-03-24 16:48:08 +03:00
parent c6578405fc 993052409a
commit 6646eefb5e
263 changed files with 46093 additions and 68263 deletions
@@ -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()