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

8
Minecraft.World/PigZombie.cpp
View File

@@ -53,7 +53,7 @@ void PigZombie::tick()
AttributeInstance *speed = getAttribute(SharedMonsterAttributes::MOVEMENT_SPEED);
speed->removeModifier(SPEED_MODIFIER_ATTACKING);
if (attackTarget != nullptr)
if (attackTarget != NULL)
{
speed->addModifier(new AttributeModifier(*SPEED_MODIFIER_ATTACKING));
}
@@ -78,7 +78,7 @@ bool PigZombie::canSpawn()
void PigZombie::addAdditonalSaveData(CompoundTag *tag)
{
Zombie::addAdditonalSaveData(tag);
tag->putShort(L"Anger", static_cast<short>(angerTime));
tag->putShort(L"Anger", (short) angerTime);
}
void PigZombie::readAdditionalSaveData(CompoundTag *tag)
@@ -105,7 +105,7 @@ shared_ptr<Entity> PigZombie::findAttackTarget()
bool PigZombie::hurt(DamageSource *source, float dmg)
{
shared_ptr<Entity> sourceEntity = source->getEntity();
if ( sourceEntity != nullptr && sourceEntity->instanceof(eTYPE_PLAYER) )
if ( sourceEntity != NULL && sourceEntity->instanceof(eTYPE_PLAYER) )
{
vector<shared_ptr<Entity> > *nearby = level->getEntities( shared_from_this(), bb->grow(32, 32, 32));
for (auto& e : *nearby)
@@ -174,7 +174,7 @@ int PigZombie::getDeathLoot()
void PigZombie::populateDefaultEquipmentSlots()
{
setEquippedSlot(SLOT_WEAPON, std::make_shared<ItemInstance>(Item::sword_gold));
setEquippedSlot(SLOT_WEAPON, shared_ptr<ItemInstance>( new ItemInstance(Item::sword_gold)) );
}
MobGroupData *PigZombie::finalizeMobSpawn(MobGroupData *groupData, int extraData /*= 0*/) // 4J Added extraData param