aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/Ozelot.cpp
diff options
context:
space:
mode:
authorvoid_17 <heroerror3@gmail.com>2026-03-02 17:37:16 +0700
committervoid_17 <heroerror3@gmail.com>2026-03-02 17:37:16 +0700
commit119bff351450ea16ffda550b6e0f67379b29f708 (patch)
treed9f28714afd516bc2450f33b0a77c5e05ff4de90 /Minecraft.World/Ozelot.cpp
parent8a2a62ea1d47364f802cf9aae97668bc4a7007b5 (diff)
Revert "shared_ptr -> std::shared_ptr"
This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5.
Diffstat (limited to 'Minecraft.World/Ozelot.cpp')
-rw-r--r--Minecraft.World/Ozelot.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/Minecraft.World/Ozelot.cpp b/Minecraft.World/Ozelot.cpp
index e43705ec..3c05f357 100644
--- a/Minecraft.World/Ozelot.cpp
+++ b/Minecraft.World/Ozelot.cpp
@@ -184,7 +184,7 @@ int Ozelot::getDeathLoot()
return Item::leather_Id;
}
-bool Ozelot::doHurtTarget(std::shared_ptr<Entity> target)
+bool Ozelot::doHurtTarget(shared_ptr<Entity> target)
{
return target->hurt(DamageSource::mobAttack(dynamic_pointer_cast<Mob>(shared_from_this())), 3);
}
@@ -199,9 +199,9 @@ void Ozelot::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel)
{
}
-bool Ozelot::interact(std::shared_ptr<Player> player)
+bool Ozelot::interact(shared_ptr<Player> player)
{
- std::shared_ptr<ItemInstance> item = player->inventory->getSelected();
+ shared_ptr<ItemInstance> item = player->inventory->getSelected();
if (isTame())
{
if (equalsIgnoreCase(player->getUUID(), getOwnerUUID()))
@@ -250,12 +250,12 @@ bool Ozelot::interact(std::shared_ptr<Player> player)
return TamableAnimal::interact(player);
}
-std::shared_ptr<AgableMob> Ozelot::getBreedOffspring(std::shared_ptr<AgableMob> target)
+shared_ptr<AgableMob> Ozelot::getBreedOffspring(shared_ptr<AgableMob> target)
{
// 4J - added limit to number of animals that can be bred
if( level->canCreateMore( GetType(), Level::eSpawnType_Breed) )
{
- std::shared_ptr<Ozelot> offspring = std::shared_ptr<Ozelot>( new Ozelot(level) );
+ shared_ptr<Ozelot> offspring = shared_ptr<Ozelot>( new Ozelot(level) );
if (isTame())
{
offspring->setOwnerUUID(getOwnerUUID());
@@ -270,17 +270,17 @@ std::shared_ptr<AgableMob> Ozelot::getBreedOffspring(std::shared_ptr<AgableMob>
}
}
-bool Ozelot::isFood(std::shared_ptr<ItemInstance> itemInstance)
+bool Ozelot::isFood(shared_ptr<ItemInstance> itemInstance)
{
return itemInstance != NULL && itemInstance->id == Item::fish_raw_Id;
}
-bool Ozelot::canMate(std::shared_ptr<Animal> animal)
+bool Ozelot::canMate(shared_ptr<Animal> animal)
{
if (animal == shared_from_this()) return false;
if (!isTame()) return false;
- std::shared_ptr<Ozelot> partner = dynamic_pointer_cast<Ozelot>(animal);
+ shared_ptr<Ozelot> partner = dynamic_pointer_cast<Ozelot>(animal);
if (partner == NULL) return false;
if (!partner->isTame()) return false;