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/MerchantRecipe.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'Minecraft.World/MerchantRecipe.h') diff --git a/Minecraft.World/MerchantRecipe.h b/Minecraft.World/MerchantRecipe.h index dd684b6a..0ed84898 100644 --- a/Minecraft.World/MerchantRecipe.h +++ b/Minecraft.World/MerchantRecipe.h @@ -3,25 +3,25 @@ class MerchantRecipe { private: - std::shared_ptr buyA; - std::shared_ptr buyB; - std::shared_ptr sell; + shared_ptr buyA; + shared_ptr buyB; + shared_ptr sell; int uses; int maxUses; - void _init(std::shared_ptr buyA, std::shared_ptr buyB, std::shared_ptr sell); + void _init(shared_ptr buyA, shared_ptr buyB, shared_ptr sell); public: MerchantRecipe(CompoundTag *tag); - MerchantRecipe(std::shared_ptr buyA, std::shared_ptr buyB, std::shared_ptr sell, int uses = 0, int maxUses = 7); - MerchantRecipe(std::shared_ptr buy, std::shared_ptr sell); - MerchantRecipe(std::shared_ptr buy, Item *sell); - MerchantRecipe(std::shared_ptr buy, Tile *sell); + MerchantRecipe(shared_ptr buyA, shared_ptr buyB, shared_ptr sell, int uses = 0, int maxUses = 7); + MerchantRecipe(shared_ptr buy, shared_ptr sell); + MerchantRecipe(shared_ptr buy, Item *sell); + MerchantRecipe(shared_ptr buy, Tile *sell); - std::shared_ptr getBuyAItem(); - std::shared_ptr getBuyBItem(); + shared_ptr getBuyAItem(); + shared_ptr getBuyBItem(); bool hasSecondaryBuyItem(); - std::shared_ptr getSellItem(); + shared_ptr getSellItem(); bool isSame(MerchantRecipe *other); bool isSameSameButBetter(MerchantRecipe *other); int getUses(); -- cgit v1.2.3