From 119bff351450ea16ffda550b6e0f67379b29f708 Mon Sep 17 00:00:00 2001 From: void_17 Date: Mon, 2 Mar 2026 17:37:16 +0700 Subject: Revert "shared_ptr -> std::shared_ptr" This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5. --- Minecraft.World/Ozelot.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Minecraft.World/Ozelot.cpp') 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 target) +bool Ozelot::doHurtTarget(shared_ptr target) { return target->hurt(DamageSource::mobAttack(dynamic_pointer_cast(shared_from_this())), 3); } @@ -199,9 +199,9 @@ void Ozelot::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel) { } -bool Ozelot::interact(std::shared_ptr player) +bool Ozelot::interact(shared_ptr player) { - std::shared_ptr item = player->inventory->getSelected(); + shared_ptr item = player->inventory->getSelected(); if (isTame()) { if (equalsIgnoreCase(player->getUUID(), getOwnerUUID())) @@ -250,12 +250,12 @@ bool Ozelot::interact(std::shared_ptr player) return TamableAnimal::interact(player); } -std::shared_ptr Ozelot::getBreedOffspring(std::shared_ptr target) +shared_ptr Ozelot::getBreedOffspring(shared_ptr target) { // 4J - added limit to number of animals that can be bred if( level->canCreateMore( GetType(), Level::eSpawnType_Breed) ) { - std::shared_ptr offspring = std::shared_ptr( new Ozelot(level) ); + shared_ptr offspring = shared_ptr( new Ozelot(level) ); if (isTame()) { offspring->setOwnerUUID(getOwnerUUID()); @@ -270,17 +270,17 @@ std::shared_ptr Ozelot::getBreedOffspring(std::shared_ptr } } -bool Ozelot::isFood(std::shared_ptr itemInstance) +bool Ozelot::isFood(shared_ptr itemInstance) { return itemInstance != NULL && itemInstance->id == Item::fish_raw_Id; } -bool Ozelot::canMate(std::shared_ptr animal) +bool Ozelot::canMate(shared_ptr animal) { if (animal == shared_from_this()) return false; if (!isTame()) return false; - std::shared_ptr partner = dynamic_pointer_cast(animal); + shared_ptr partner = dynamic_pointer_cast(animal); if (partner == NULL) return false; if (!partner->isTame()) return false; -- cgit v1.2.3