backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-04-27 14:43:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

resolve conflicts

Browse source
This commit is contained in:
Leah Anderson 2026-03-02 13:57:58 -07:00
parent 41a0befd07 365f6ad5eb
commit b2e255fc05
5 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Minecraft.Client/Textures.h
View file

@ -1,5 +1,5 @@
#pragma once
#include "..\Minecraft.World\ArrayWithLength.h"
#include "../Minecraft.World/ArrayWithLength.h"
class DynamicTexture;
class BufferedImage;

10
Minecraft.World/Entity.cpp
View file

@ -133,7 +133,7 @@ void Entity::countFlagsForPIX()
void Entity::resetSmallId()
{
freeSmallId(entityId);
if( ((size_t)TlsGetValue(tlsIdx) != 0 ) )
if( ((size_t)pthread_getspecific(tlsIdx) != 0 ) )
{
entityId = getSmallId();
}
@ -141,7 +141,7 @@ void Entity::resetSmallId()
void Entity::freeSmallId(int index)
{
if( ( (size_t)TlsGetValue(tlsIdx) ) == 0 ) return; // Don't do anything with small ids if this isn't the server thread
if( ( (size_t)pthread_getspecific(tlsIdx) ) == 0 ) return; // Don't do anything with small ids if this isn't the server thread
if( index >= 2048 ) return; // Don't do anything if this isn't a short id
unsigned int i = index / 32;
@ -164,7 +164,7 @@ void Entity::useSmallIds()
// Let the management system here know whether or not to consider this particular entity for some extra wandering
void Entity::considerForExtraWandering(bool enable)
{
if( ( (size_t)TlsGetValue(tlsIdx) ) == 0 ) return; // Don't do anything with small ids if this isn't the server thread
if( ( (size_t)pthread_getspecific(tlsIdx) ) == 0 ) return; // Don't do anything with small ids if this isn't the server thread
if( entityId >= 2048 ) return; // Don't do anything if this isn't a short id
unsigned int i = entityId / 32;
@ -184,7 +184,7 @@ void Entity::considerForExtraWandering(bool enable)
// Should this entity do wandering in addition to what the java code would have done?
bool Entity::isExtraWanderingEnabled()
{
if( ( (size_t)TlsGetValue(tlsIdx) ) == 0 ) return false; // Don't do anything with small ids if this isn't the server thread
if( ( (size_t)pthread_getspecific(tlsIdx) ) == 0 ) return false; // Don't do anything with small ids if this isn't the server thread
if( entityId >= 2048 ) return false; // Don't do anything if this isn't a short id
for( int i = 0; i < extraWanderCount; i++ )
@ -247,7 +247,7 @@ void Entity::_init(bool useSmallId)
// 4J - changed to assign two different types of ids. A range from 0-2047 is used for things that we'll be wanting to identify over the network,
// so we should only need 11 bits rather than 32 to uniquely identify them. The rest of the range is used for anything we don't need to track like this,
// currently particles. We only ever want to allocate this type of id from the server thread, so using thread local storage to isolate this.
if( useSmallId && ((size_t)TlsGetValue(tlsIdx) != 0 ) )
if( useSmallId && ((size_t)pthread_getspecific(tlsIdx) != 0 ) )
{
entityId = getSmallId();
}

2
Minecraft.World/Entity.h
View file

@ -369,7 +369,7 @@ private:
#if defined(_WIN32)
static DWORD tlsIdx;
#else
static pthread_key_t tlsKey;
static pthread_key_t tlsIdx;
#endif
public:
static void tickExtraWandering();

3
Minecraft.World/EntityIO.cpp
View file

@ -13,7 +13,8 @@
#include "net.minecraft.world.level.h"
#include "com.mojang.nbt.h"
#include "EntityIO.h"
#include "../Minecraft.Client/OrbisMedia/strings.h"
#include "../Minecraft.Client/Windows64Media/strings.h"
unordered_map<wstring, entityCreateFn> *EntityIO::idCreateMap = new unordered_map<wstring, entityCreateFn>;
unordered_map<eINSTANCEOF, wstring, eINSTANCEOFKeyHash, eINSTANCEOFKeyEq> *EntityIO::classIdMap = new unordered_map<eINSTANCEOF, wstring, eINSTANCEOFKeyHash, eINSTANCEOFKeyEq>;
unordered_map<int, entityCreateFn> *EntityIO::numCreateMap = new unordered_map<int, entityCreateFn>;

2
Minecraft.World/Mob.cpp
View file

@ -18,7 +18,7 @@
#include "net.minecraft.world.item.enchantment.h"
#include "com.mojang.nbt.h"
#include "Mob.h"
#include "..\Minecraft.Client\Textures.h"
#include "../Minecraft.Client/Textures.h"
#include "SoundTypes.h"
#include "BasicTypeContainers.h"
#include "ParticleTypes.h"