aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/IndirectEntityDamageSource.cpp
diff options
context:
space:
mode:
authorLoki Rautio <lokirautio@gmail.com>2026-03-07 21:12:22 -0600
committerLoki Rautio <lokirautio@gmail.com>2026-03-07 21:12:22 -0600
commit087b7e7abfe81dd7f0fdcdea36ac9f245950df1a (patch)
tree69454763e73ca764af4e682d3573080b13138a0e /Minecraft.World/IndirectEntityDamageSource.cpp
parenta9be52c41a02d207233199e98898fe7483d7e817 (diff)
Revert "Project modernization (#630)"
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 a9be52c41a02d207233199e98898fe7483d7e817.
Diffstat (limited to 'Minecraft.World/IndirectEntityDamageSource.cpp')
-rw-r--r--Minecraft.World/IndirectEntityDamageSource.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Minecraft.World/IndirectEntityDamageSource.cpp b/Minecraft.World/IndirectEntityDamageSource.cpp
index a24ad1a7..c2a67af5 100644
--- a/Minecraft.World/IndirectEntityDamageSource.cpp
+++ b/Minecraft.World/IndirectEntityDamageSource.cpp
@@ -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 ) );
}
}