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

Revert "shared_ptr -> std::shared_ptr"

Browse Source 
This reverts commit 7074f35e4b.
This commit is contained in:
void_17
2026-03-02 17:37:16 +07:00
parent 8a2a62ea1d
commit 119bff3514
1373 changed files with 12049 additions and 12049 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Minecraft.World/MerchantMenu.h
View File

@@ -25,22 +25,22 @@ public:
private:
std::shared_ptr<Merchant> trader;
std::shared_ptr<MerchantContainer> tradeContainer;
shared_ptr<Merchant> trader;
shared_ptr<MerchantContainer> tradeContainer;
Level *level;
public:
MerchantMenu(std::shared_ptr<Inventory> inventory, std::shared_ptr<Merchant> merchant, Level *level);
MerchantMenu(shared_ptr<Inventory> inventory, shared_ptr<Merchant> merchant, Level *level);
std::shared_ptr<MerchantContainer> getTradeContainer();
shared_ptr<MerchantContainer> getTradeContainer();
void addSlotListener(ContainerListener *listener);
void broadcastChanges();
void slotsChanged(); // 4J used to take a std::shared_ptr<Container> but wasn't using it, so removed to simplify things
void slotsChanged(); // 4J used to take a shared_ptr<Container> 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> player);
std::shared_ptr<ItemInstance> quickMoveStack(std::shared_ptr<Player> player, int slotIndex);
void removed(std::shared_ptr<Player> player);
bool stillValid(shared_ptr<Player> player);
shared_ptr<ItemInstance> quickMoveStack(shared_ptr<Player> player, int slotIndex);
void removed(shared_ptr<Player> player);
std::shared_ptr<Merchant> getMerchant(); // 4J Added
shared_ptr<Merchant> getMerchant(); // 4J Added
};