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

feat: TU19 (Dec 2014) Features & Content (#155)

Browse Source 
* try to resolve merge conflict

* feat: TU19 (Dec 2014) Features & Content (#32)

* December 2014 files

* Working release build

* Fix compilation issues

* Add sound to Windows64Media

* Add DLC content and force Tutorial DLC

* Revert "Add DLC content and force Tutorial DLC"

This reverts commit 97a4399472.

* Disable broken light packing

* Disable breakpoint during DLC texture map load

Allows DLC loading but the DLC textures are still broken

* Fix post build not working

* ...

* fix vs2022 build

* fix cmake build

---------

Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
daoge
2026-03-03 03:04:10 +08:00
committed by GitHub
parent 84c31a2331
commit b3feddfef3
2069 changed files with 264842 additions and 139522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Minecraft.World/TamableAnimal.cpp
View File

@@ -68,6 +68,7 @@ void TamableAnimal::readAdditionalSaveData(CompoundTag *tag)
setTame(true);
}
sitGoal->wantToSit(tag->getBoolean(L"Sitting"));
setSitting(tag->getBoolean(L"Sitting"));
}
void TamableAnimal::spawnTamingParticles(bool success)
@@ -148,7 +149,7 @@ void TamableAnimal::setOwnerUUID(const wstring &name)
entityData->set(DATA_OWNERUUID_ID, name);
}
shared_ptr<Mob> TamableAnimal::getOwner()
shared_ptr<Entity> TamableAnimal::getOwner()
{
return level->getPlayerByUUID(getOwnerUUID());
}
@@ -156,4 +157,39 @@ shared_ptr<Mob> TamableAnimal::getOwner()
SitGoal *TamableAnimal::getSitGoal()
{
return sitGoal;
}
bool TamableAnimal::wantsToAttack(shared_ptr<LivingEntity> target, shared_ptr<LivingEntity> owner)
{
return true;
}
Team *TamableAnimal::getTeam()
{
if (isTame())
{
shared_ptr<LivingEntity> owner = dynamic_pointer_cast<LivingEntity>(getOwner());
if (owner != NULL)
{
return owner->getTeam();
}
}
return Animal::getTeam();
}
bool TamableAnimal::isAlliedTo(shared_ptr<LivingEntity> other)
{
if (isTame())
{
shared_ptr<LivingEntity> owner = dynamic_pointer_cast<LivingEntity>(getOwner());
if (other == owner)
{
return true;
}
if (owner != NULL)
{
return owner->isAlliedTo(other);
}
}
return Animal::isAlliedTo(other);
}