Use BYTE Win Typedef instead of byte typedef from Minecraft.World

This commit is contained in:
GabsPuNs
2026-05-10 21:03:03 -04:00
parent 20d395b88d
commit 3e7983ab3c
216 changed files with 798 additions and 800 deletions

View File

@@ -373,7 +373,7 @@ Entity::Entity(Level *level, bool useSmallId) // 4J - added useSmallId parameter
if( entityData )
{
entityData->define(DATA_SHARED_FLAGS_ID, static_cast<byte>(0));
entityData->define(DATA_SHARED_FLAGS_ID, static_cast<BYTE>(0));
entityData->define(DATA_AIR_SUPPLY_ID, TOTAL_AIR_SUPPLY); // 4J Stu - Brought forward from 1.2.3 to fix 38654 - Gameplay: Player will take damage when air bubbles are present if resuming game from load/autosave underwater.
}
@@ -1727,7 +1727,7 @@ void Entity::lerpMotion(double xd, double yd, double zd)
this->zd = zd;
}
void Entity::handleEntityEvent(byte eventId)
void Entity::handleEntityEvent(BYTE eventId)
{
}
@@ -1836,14 +1836,14 @@ void Entity::setSharedFlag(int flag, bool value)
{
if( entityData )
{
byte currentValue = entityData->getByte(DATA_SHARED_FLAGS_ID);
BYTE currentValue = entityData->getByte(DATA_SHARED_FLAGS_ID);
if (value)
{
entityData->set(DATA_SHARED_FLAGS_ID, static_cast<byte>(currentValue | (1 << flag)));
entityData->set(DATA_SHARED_FLAGS_ID, static_cast<BYTE>(currentValue | (1 << flag)));
}
else
{
entityData->set(DATA_SHARED_FLAGS_ID, static_cast<byte>(currentValue & ~(1 << flag)));
entityData->set(DATA_SHARED_FLAGS_ID, static_cast<BYTE>(currentValue & ~(1 << flag)));
}
}
}