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

Revert "shared_ptr -> std::shared_ptr"

Browse Source 
This reverts commit 7074f35e4b.
This commit is contained in:
void_17
2026-03-02 17:37:16 +07:00
parent 8a2a62ea1d
commit 119bff3514
1373 changed files with 12049 additions and 12049 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Minecraft.World/IndirectEntityDamageSource.cpp
View File

@@ -4,30 +4,30 @@
#include "net.minecraft.world.damagesource.h"
#include "net.minecraft.network.packet.h"
//IndirectEntityDamageSource::IndirectEntityDamageSource(const wstring &msgId, std::shared_ptr<Entity> entity, std::shared_ptr<Entity> owner) : EntityDamageSource(msgId, entity)
IndirectEntityDamageSource::IndirectEntityDamageSource(ChatPacket::EChatPacketMessage msgId, std::shared_ptr<Entity> entity, std::shared_ptr<Entity> owner) : EntityDamageSource(msgId, entity)
//IndirectEntityDamageSource::IndirectEntityDamageSource(const wstring &msgId, shared_ptr<Entity> entity, shared_ptr<Entity> owner) : EntityDamageSource(msgId, entity)
IndirectEntityDamageSource::IndirectEntityDamageSource(ChatPacket::EChatPacketMessage msgId, shared_ptr<Entity> entity, shared_ptr<Entity> owner) : EntityDamageSource(msgId, entity)
{
this->owner = owner;
}
// 4J Stu - Brought forward from 1.2.3 to fix #46422
std::shared_ptr<Entity> IndirectEntityDamageSource::getDirectEntity()
shared_ptr<Entity> IndirectEntityDamageSource::getDirectEntity()
{
return entity;
}
std::shared_ptr<Entity> IndirectEntityDamageSource::getEntity()
shared_ptr<Entity> IndirectEntityDamageSource::getEntity()
{
return owner;
}
//wstring IndirectEntityDamageSource::getLocalizedDeathMessage(std::shared_ptr<Player> player)
//wstring IndirectEntityDamageSource::getLocalizedDeathMessage(shared_ptr<Player> player)
//{
// return L"death." + msgId + player->name + owner->getAName();
// //return I18n.get("death." + msgId, player.name, owner.getAName());
//}
std::shared_ptr<ChatPacket> IndirectEntityDamageSource::getDeathMessagePacket(std::shared_ptr<Player> player)
shared_ptr<ChatPacket> IndirectEntityDamageSource::getDeathMessagePacket(shared_ptr<Player> player)
{
wstring additional = L"";
int type;
@@ -36,7 +36,7 @@ std::shared_ptr<ChatPacket> IndirectEntityDamageSource::getDeathMessagePacket(st
type = owner->GetType();
if(type == eTYPE_SERVERPLAYER)
{
std::shared_ptr<Player> sourcePlayer = dynamic_pointer_cast<Player>(owner);
shared_ptr<Player> sourcePlayer = dynamic_pointer_cast<Player>(owner);
if(sourcePlayer != NULL) additional = sourcePlayer->name;
}
}
@@ -44,5 +44,5 @@ std::shared_ptr<ChatPacket> IndirectEntityDamageSource::getDeathMessagePacket(st
{
type = entity->GetType();
}
return std::shared_ptr<ChatPacket>( new ChatPacket(player->name, m_msgId, type, additional ) );
return shared_ptr<ChatPacket>( new ChatPacket(player->name, m_msgId, type, additional ) );
}