Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Project modernization (#630)"

Browse Source 
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.

This reverts commit a9be52c41a.
This commit is contained in:
Loki Rautio
2026-03-07 21:12:22 -06:00
parent a9be52c41a
commit 087b7e7abf
1373 changed files with 19449 additions and 19903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Minecraft.World/TamableAnimal.cpp
View File

@@ -13,13 +13,13 @@ TamableAnimal::TamableAnimal(Level *level) : Animal(level)
TamableAnimal::~TamableAnimal()
{
if(sitGoal != nullptr) delete sitGoal;
if(sitGoal != NULL) delete sitGoal;
}
void TamableAnimal::defineSynchedData()
{
Animal::defineSynchedData();
entityData->define(DATA_FLAGS_ID, static_cast<byte>(0));
entityData->define(DATA_FLAGS_ID, (byte) 0);
entityData->define(DATA_OWNERUUID_ID, L"");
}
@@ -113,11 +113,11 @@ void TamableAnimal::setTame(bool value)
byte current = entityData->getByte(DATA_FLAGS_ID);
if (value)
{
entityData->set(DATA_FLAGS_ID, static_cast<byte>(current | 0x04));
entityData->set(DATA_FLAGS_ID, (byte) (current | 0x04));
}
else
{
entityData->set(DATA_FLAGS_ID, static_cast<byte>(current & ~0x04));
entityData->set(DATA_FLAGS_ID, (byte) (current & ~0x04));
}
}
@@ -131,11 +131,11 @@ void TamableAnimal::setSitting(bool value)
byte current = entityData->getByte(DATA_FLAGS_ID);
if (value)
{
entityData->set(DATA_FLAGS_ID, static_cast<byte>(current | 0x01));
entityData->set(DATA_FLAGS_ID, (byte) (current | 0x01));
}
else
{
entityData->set(DATA_FLAGS_ID, static_cast<byte>(current & ~0x01));
entityData->set(DATA_FLAGS_ID, (byte) (current & ~0x01));
}
}
@@ -169,7 +169,7 @@ Team *TamableAnimal::getTeam()
if (isTame())
{
shared_ptr<LivingEntity> owner = dynamic_pointer_cast<LivingEntity>(getOwner());
if (owner != nullptr)
if (owner != NULL)
{
return owner->getTeam();
}
@@ -186,7 +186,7 @@ bool TamableAnimal::isAlliedTo(shared_ptr<LivingEntity> other)
{
return true;
}
if (owner != nullptr)
if (owner != NULL)
{
return owner->isAlliedTo(other);
}