diff options
Diffstat (limited to 'Minecraft.World/IndirectEntityDamageSource.cpp')
| -rw-r--r-- | Minecraft.World/IndirectEntityDamageSource.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Minecraft.World/IndirectEntityDamageSource.cpp b/Minecraft.World/IndirectEntityDamageSource.cpp index c2a67af5..a24ad1a7 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 != NULL) + if(owner != nullptr) { type = owner->GetType(); if(type == eTYPE_SERVERPLAYER) { shared_ptr<Player> sourcePlayer = dynamic_pointer_cast<Player>(owner); - if(sourcePlayer != NULL) additional = sourcePlayer->name; + if(sourcePlayer != nullptr) additional = sourcePlayer->name; } } else { type = entity->GetType(); } - if(held != NULL && held->hasCustomHoverName() ) + if(held != nullptr && held->hasCustomHoverName() ) { - return shared_ptr<ChatPacket>( new ChatPacket(player->getNetworkName(), m_msgWithItemId, type, additional, held->getHoverName() ) ); + return std::make_shared<ChatPacket>(player->getNetworkName(), m_msgWithItemId, type, additional, held->getHoverName()); } else { - return shared_ptr<ChatPacket>( new ChatPacket(player->getNetworkName(), m_msgId, type, additional ) ); + return std::make_shared<ChatPacket>(player->getNetworkName(), m_msgId, type, additional); } } |