aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/Monster.cpp
diff options
context:
space:
mode:
authorvoid_17 <heroerror3@gmail.com>2026-03-02 15:58:20 +0700
committervoid_17 <heroerror3@gmail.com>2026-03-02 15:58:20 +0700
commit7074f35e4ba831e358117842b99ee35b87f85ae5 (patch)
tree7d440d23473196af3056bf2ff4c59d9e740a06f5 /Minecraft.World/Monster.cpp
parentd63f79325f85e014361eb8cf1e41eaebedb1ae71 (diff)
shared_ptr -> std::shared_ptr
This is one of the first commits in a plan to remove all `using namespace std;` lines in the entire codebase as it is considered anti-pattern today.
Diffstat (limited to 'Minecraft.World/Monster.cpp')
-rw-r--r--Minecraft.World/Monster.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/Minecraft.World/Monster.cpp b/Minecraft.World/Monster.cpp
index 627ce8d1..1ec418ae 100644
--- a/Minecraft.World/Monster.cpp
+++ b/Minecraft.World/Monster.cpp
@@ -30,7 +30,7 @@ Monster::Monster(Level *level) : PathfinderMob( level )
xpReward = Enemy::XP_REWARD_MEDIUM;
}
-void Monster::aiStep()
+void Monster::aiStep()
{
float br = getBrightness(1);
if (br > 0.5f)
@@ -47,28 +47,28 @@ void Monster::tick()
if (!level->isClientSide && (level->difficulty == Difficulty::PEACEFUL || Minecraft::GetInstance()->isTutorial() ) ) remove();
}
-shared_ptr<Entity> Monster::findAttackTarget()
+std::shared_ptr<Entity> Monster::findAttackTarget()
{
#ifndef _FINAL_BUILD
if(app.GetMobsDontAttackEnabled())
{
- return shared_ptr<Player>();
+ return std::shared_ptr<Player>();
}
#endif
- shared_ptr<Player> player = level->getNearestAttackablePlayer(shared_from_this(), 16);
+ std::shared_ptr<Player> player = level->getNearestAttackablePlayer(shared_from_this(), 16);
if (player != NULL && canSee(player) ) return player;
- return shared_ptr<Player>();
+ return std::shared_ptr<Player>();
}
bool Monster::hurt(DamageSource *source, int dmg)
{
if (PathfinderMob::hurt(source, dmg))
{
- shared_ptr<Entity> sourceEntity = source->getEntity();
+ std::shared_ptr<Entity> sourceEntity = source->getEntity();
if (rider.lock() == sourceEntity || riding == sourceEntity) return true;
- if (sourceEntity != shared_from_this())
+ if (sourceEntity != shared_from_this())
{
this->attackTarget = sourceEntity;
}
@@ -79,11 +79,11 @@ bool Monster::hurt(DamageSource *source, int dmg)
/**
* Performs hurt action, returns if successful
-*
+*
* @param target
* @return
*/
-bool Monster::doHurtTarget(shared_ptr<Entity> target)
+bool Monster::doHurtTarget(std::shared_ptr<Entity> target)
{
int dmg = attackDamage;
if (hasEffect(MobEffect::damageBoost))
@@ -107,7 +107,7 @@ bool Monster::doHurtTarget(shared_ptr<Entity> target)
target->setOnFire(fireAspect * 4);
}
- shared_ptr<Mob> mob = dynamic_pointer_cast<Mob>(target);
+ std::shared_ptr<Mob> mob = dynamic_pointer_cast<Mob>(target);
if (mob != NULL)
{
ThornsEnchantment::doThornsAfterAttack(shared_from_this(), mob, random);
@@ -117,7 +117,7 @@ bool Monster::doHurtTarget(shared_ptr<Entity> target)
return didHurt;
}
-void Monster::checkHurtTarget(shared_ptr<Entity> target, float distance)
+void Monster::checkHurtTarget(std::shared_ptr<Entity> target, float distance)
{
if (attackTime <= 0 && distance < 2.0f && target->bb->y1 > bb->y0 && target->bb->y0 < bb->y1)
{
@@ -140,7 +140,7 @@ bool Monster::isDarkEnoughToSpawn()
int br = level->getRawBrightness(xt, yt, zt);
- if (level->isThundering())
+ if (level->isThundering())
{
int tmp = level->skyDarken;
level->skyDarken = 10;