LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-05-30 22:36:12 +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/ClientSideMerchant.cpp
View File

@@ -4,9 +4,9 @@
#include "ClientSideMerchant.h"
ClientSideMerchant::ClientSideMerchant(std::shared_ptr<Player> source,
int name) {
const std::wstring& name) {
this->source = source;
// 4J Stu - Need to do this after creating as a std::shared_ptr
// 4J Stu - Need to do this after creating as a shared_ptr
container = NULL; // new MerchantContainer(source, this);
currentOffers = NULL;
m_name = name;
@@ -46,4 +46,4 @@ void ClientSideMerchant::notifyTrade(MerchantRecipe* activeRecipe) {
void ClientSideMerchant::notifyTradeUpdated(
std::shared_ptr<ItemInstance> item) {}
int ClientSideMerchant::getDisplayName() { return m_name; }
std::wstring ClientSideMerchant::getDisplayName() { return m_name; }