LegacyConsoleArchive/4jcraft
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-10-02 10:12:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: unglob std::shared_ptr

Browse Source
This commit is contained in:
Tropical
2026-03-06 11:20:45 -06:00
parent 0dd1654dec
commit 67ceccf2d4
1065 changed files with 5754 additions and 5749 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.World/Entities/HangingEntity.cpp
+6 -6
View File
@@ -148,14 +148,14 @@ bool HangingEntity::survives()
}
}
vector<shared_ptr<Entity> > *entities = level->getEntities(shared_from_this(), bb);
vector<std::shared_ptr<Entity> > *entities = level->getEntities(shared_from_this(), bb);
if (entities != NULL && entities->size() > 0)
{
AUTO_VAR(itEnd, entities->end());
for (AUTO_VAR(it, entities->begin()); it != itEnd; it++)
{
shared_ptr<Entity> e = (*it);
std::shared_ptr<Entity> e = (*it);
if(dynamic_pointer_cast<HangingEntity>(e) != NULL)
{
return false;
@@ -172,7 +172,7 @@ bool HangingEntity::isPickable()
return true;
}
bool HangingEntity::skipAttackInteraction(shared_ptr<Entity> source)
bool HangingEntity::skipAttackInteraction(std::shared_ptr<Entity> source)
{
if(source->GetType()==eTYPE_PLAYER)
{
@@ -187,7 +187,7 @@ bool HangingEntity::hurt(DamageSource *source, int damage)
{
if (dynamic_cast<EntityDamageSource *>(source) != NULL)
{
shared_ptr<Entity> sourceEntity = source->getDirectEntity();
std::shared_ptr<Entity> sourceEntity = source->getDirectEntity();
if (dynamic_pointer_cast<Player>(sourceEntity) != NULL && !dynamic_pointer_cast<Player>(sourceEntity)->isAllowedToHurtEntity(shared_from_this()) )
{
@@ -198,8 +198,8 @@ bool HangingEntity::hurt(DamageSource *source, int damage)
remove();
markHurt();
shared_ptr<Player> player = nullptr;
shared_ptr<Entity> e = source->getEntity();
std::shared_ptr<Player> player = nullptr;
std::shared_ptr<Entity> e = source->getEntity();
if (e!=NULL && ((e->GetType() & eTYPE_PLAYER)!=0) ) // check if it's serverplayer or player
{
player = dynamic_pointer_cast<Player>( e );