Merge branch 'smartcmd:main' into main

This commit is contained in:
Fayaz Shaikh 2026-03-02 21:39:52 -05:00 committed by GitHub
commit 7f2b7830a9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -596,7 +596,14 @@ void MapItemSavedData::mergeInMapData(shared_ptr<MapItemSavedData> dataToAdd)
void MapItemSavedData::removeItemFrameDecoration(shared_ptr<ItemInstance> item)
{
AUTO_VAR(frameDecoration, nonPlayerDecorations.find( item->getFrame()->entityId ) );
if ( !item )
return;
std::shared_ptr<ItemFrame> frame = item->getFrame();
if ( !frame )
return;
auto frameDecoration = nonPlayerDecorations.find(frame->entityId);
if ( frameDecoration != nonPlayerDecorations.end() )
{
delete frameDecoration->second;