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

Revert "Project modernization (#630)"

Browse Source 
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.

This reverts commit a9be52c41a.
This commit is contained in:
Loki Rautio
2026-03-07 21:12:22 -06:00
parent a9be52c41a
commit 087b7e7abf
1373 changed files with 19449 additions and 19903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Minecraft.World/IndirectEntityDamageSource.cpp
View File

@@ -32,26 +32,26 @@ shared_ptr<ChatPacket> IndirectEntityDamageSource::getDeathMessagePacket(shared_
shared_ptr<ItemInstance> held = entity->instanceof(eTYPE_LIVINGENTITY) ? dynamic_pointer_cast<LivingEntity>(entity)->getCarriedItem() : nullptr;
wstring additional = L"";
int type;
if(owner != nullptr)
if(owner != NULL)
{
type = owner->GetType();
if(type == eTYPE_SERVERPLAYER)
{
shared_ptr<Player> sourcePlayer = dynamic_pointer_cast<Player>(owner);
if(sourcePlayer != nullptr) additional = sourcePlayer->name;
if(sourcePlayer != NULL) additional = sourcePlayer->name;
}
}
else
{
type = entity->GetType();
}
if(held != nullptr && held->hasCustomHoverName() )
if(held != NULL && held->hasCustomHoverName() )
{
return std::make_shared<ChatPacket>(player->getNetworkName(), m_msgWithItemId, type, additional, held->getHoverName());
return shared_ptr<ChatPacket>( new ChatPacket(player->getNetworkName(), m_msgWithItemId, type, additional, held->getHoverName() ) );
}
else
{
return std::make_shared<ChatPacket>(player->getNetworkName(), m_msgId, type, additional);
return shared_ptr<ChatPacket>( new ChatPacket(player->getNetworkName(), m_msgId, type, additional ) );
}
}