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/MerchantMenu.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Minecraft.World/MerchantMenu.h') diff --git a/Minecraft.World/MerchantMenu.h b/Minecraft.World/MerchantMenu.h index 23b63998..14a5fa1d 100644 --- a/Minecraft.World/MerchantMenu.h +++ b/Minecraft.World/MerchantMenu.h @@ -25,22 +25,22 @@ public: private: - std::shared_ptr trader; - std::shared_ptr tradeContainer; + shared_ptr trader; + shared_ptr tradeContainer; Level *level; public: - MerchantMenu(std::shared_ptr inventory, std::shared_ptr merchant, Level *level); + MerchantMenu(shared_ptr inventory, shared_ptr merchant, Level *level); - std::shared_ptr getTradeContainer(); + shared_ptr getTradeContainer(); void addSlotListener(ContainerListener *listener); void broadcastChanges(); - void slotsChanged(); // 4J used to take a std::shared_ptr but wasn't using it, so removed to simplify things + void slotsChanged(); // 4J used to take a shared_ptr but wasn't using it, so removed to simplify things void setSelectionHint(int hint); void setData(int id, int value); - bool stillValid(std::shared_ptr player); - std::shared_ptr quickMoveStack(std::shared_ptr player, int slotIndex); - void removed(std::shared_ptr player); + bool stillValid(shared_ptr player); + shared_ptr quickMoveStack(shared_ptr player, int slotIndex); + void removed(shared_ptr player); - std::shared_ptr getMerchant(); // 4J Added + shared_ptr getMerchant(); // 4J Added }; \ No newline at end of file -- cgit v1.2.3