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

18
Minecraft.World/Pig.cpp
View File

@@ -64,13 +64,13 @@ bool Pig::canBeControlledByRider()
{
shared_ptr<ItemInstance> item = dynamic_pointer_cast<Player>(rider.lock())->getCarriedItem();
return item != nullptr && item->id == Item::carrotOnAStick_Id;
return item != NULL && item->id == Item::carrotOnAStick_Id;
}
void Pig::defineSynchedData()
{
Animal::defineSynchedData();
entityData->define(DATA_SADDLE_ID, static_cast<byte>(0));
entityData->define(DATA_SADDLE_ID, (byte) 0);
}
void Pig::addAdditonalSaveData(CompoundTag *tag)
@@ -109,7 +109,7 @@ bool Pig::mobInteract(shared_ptr<Player> player)
{
if(!Animal::mobInteract(player))
{
if (hasSaddle() && !level->isClientSide && (rider.lock() == nullptr || rider.lock() == player))
if (hasSaddle() && !level->isClientSide && (rider.lock() == NULL || rider.lock() == player))
{
// 4J HEG - Fixed issue with player not being able to dismount pig (issue #4479)
player->ride( rider.lock() == player ? nullptr : shared_from_this() );
@@ -153,18 +153,18 @@ void Pig::setSaddle(bool value)
{
if (value)
{
entityData->set(DATA_SADDLE_ID, static_cast<byte>(1));
entityData->set(DATA_SADDLE_ID, (byte) 1);
}
else
{
entityData->set(DATA_SADDLE_ID, static_cast<byte>(0));
entityData->set(DATA_SADDLE_ID, (byte) 0);
}
}
void Pig::thunderHit(const LightningBolt *lightningBolt)
{
if (level->isClientSide) return;
shared_ptr<PigZombie> pz = std::make_shared<PigZombie>(level);
shared_ptr<PigZombie> pz = shared_ptr<PigZombie>( new PigZombie(level) );
pz->moveTo(x, y, z, yRot, xRot);
level->addEntity(pz);
remove();
@@ -173,7 +173,7 @@ void Pig::thunderHit(const LightningBolt *lightningBolt)
void Pig::causeFallDamage(float distance)
{
Animal::causeFallDamage(distance);
if ( (distance > 5) && rider.lock() != nullptr && rider.lock()->instanceof(eTYPE_PLAYER) )
if ( (distance > 5) && rider.lock() != NULL && rider.lock()->instanceof(eTYPE_PLAYER) )
{
(dynamic_pointer_cast<Player>(rider.lock()))->awardStat(GenericStats::flyPig(),GenericStats::param_flyPig());
}
@@ -184,7 +184,7 @@ shared_ptr<AgableMob> Pig::getBreedOffspring(shared_ptr<AgableMob> target)
// 4J - added limit to number of animals that can be bred
if( level->canCreateMore( GetType(), Level::eSpawnType_Breed) )
{
return std::make_shared<Pig>(level);
return shared_ptr<Pig>( new Pig(level) );
}
else
{
@@ -194,7 +194,7 @@ shared_ptr<AgableMob> Pig::getBreedOffspring(shared_ptr<AgableMob> target)
bool Pig::isFood(shared_ptr<ItemInstance> itemInstance)
{
return itemInstance != nullptr && itemInstance->id == Item::carrots_Id;
return itemInstance != NULL && itemInstance->id == Item::carrots_Id;
}
ControlledByPlayerGoal *Pig::getControlGoal()