backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-20 09:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Fix entity ID TLS key recreating on every call of getSmallid() for linux, this caused a ID pool corruption."

Browse source 
This reverts commit 047615dbbe.
This commit is contained in:
MathiewMay 2026-03-11 13:29:14 -04:00
parent e36e58609d
commit 026cb24d66
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Minecraft.World/Entities/Entity.cpp
View file

@ -24,11 +24,7 @@
int Entity::entityCounter = 2048; // 4J - changed initialiser to 2048, as we are using range 0 - 2047 as special unique smaller ids for things that need network tracked int Entity::entityCounter = 2048; // 4J - changed initialiser to 2048, as we are using range 0 - 2047 as special unique smaller ids for things that need network tracked
#ifdef _WIN32
DWORD Entity::tlsIdx = TlsAlloc(); DWORD Entity::tlsIdx = TlsAlloc();
#else
pthread_key_t Entity::tlsIdx = 0;
#endif
// 4J - added getSmallId & freeSmallId methods // 4J - added getSmallId & freeSmallId methods
unsigned int Entity::entityIdUsedFlags[2048/32] = {0}; unsigned int Entity::entityIdUsedFlags[2048/32] = {0};
@ -51,6 +47,7 @@ int Entity::getSmallId()
#ifdef _WIN32 #ifdef _WIN32
if( ((size_t)TlsGetValue(tlsIdx) != 0 ) ) if( ((size_t)TlsGetValue(tlsIdx) != 0 ) )
#else #else
pthread_key_create(&tlsIdx, nullptr);
if ( ((size_t)pthread_getspecific(tlsIdx) != 0) ) if ( ((size_t)pthread_getspecific(tlsIdx) != 0) )
#endif #endif
{ {
@ -154,16 +151,7 @@ void Entity::freeSmallId(int index)
void Entity::useSmallIds() void Entity::useSmallIds()
{ {
#ifdef _WIN32 pthread_setspecific(tlsIdx,(LPVOID)1);
TlsSetValue(tlsIdx, (LPVOID)1);
#else
static bool keyCreated = false;
if (!keyCreated) {
pthread_key_create(&tlsIdx, nullptr);
keyCreated = true;
}
pthread_setspecific(tlsIdx,(void*)1);
#endif
} }
// Things also added here to be able to manage the concept of a number of extra "wandering" entities - normally path finding entities aren't allowed to // Things also added here to be able to manage the concept of a number of extra "wandering" entities - normally path finding entities aren't allowed to