LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-05-29 10:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

TU19: merge Minecraft.World/Containers

Browse Source 
keeping virtual destructors where possible
This commit is contained in:
Tropical
2026-03-21 15:18:52 -05:00
parent db0a6b2e6a
commit f25cd66f4d
56 changed files with 1412 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Minecraft.World/Containers/MerchantMenu.cpp
View File

@@ -42,8 +42,8 @@ void MerchantMenu::broadcastChanges() {
AbstractContainerMenu::broadcastChanges();
}
// 4J used to take a std::shared_ptr<Container> but wasn't using it, so removed
// to simplify things
// 4J used to take a shared_ptr<Container> but wasn't using it, so removed to
// simplify things
void MerchantMenu::slotsChanged() {
tradeContainer->updateSellItem();
AbstractContainerMenu::slotsChanged();
@@ -64,7 +64,7 @@ std::shared_ptr<ItemInstance> MerchantMenu::quickMoveStack(
std::shared_ptr<ItemInstance> clicked = nullptr;
Slot* slot = NULL;
if (slotIndex < slots->size()) slot = slots->at(slotIndex);
if (slotIndex < slots.size()) slot = slots.at(slotIndex);
if (slot != NULL && slot->hasItem()) {
std::shared_ptr<ItemInstance> stack = slot->getItem();
clicked = stack->copy();