From 119bff351450ea16ffda550b6e0f67379b29f708 Mon Sep 17 00:00:00 2001 From: void_17 Date: Mon, 2 Mar 2026 17:37:16 +0700 Subject: Revert "shared_ptr -> std::shared_ptr" This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5. --- Minecraft.World/Ghast.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'Minecraft.World/Ghast.cpp') diff --git a/Minecraft.World/Ghast.cpp b/Minecraft.World/Ghast.cpp index 9e66830d..fcf0b705 100644 --- a/Minecraft.World/Ghast.cpp +++ b/Minecraft.World/Ghast.cpp @@ -49,7 +49,7 @@ bool Ghast::hurt(DamageSource *source, int dmg) { if (source->getMsgId() == ChatPacket::e_ChatDeathFireball) { - std::shared_ptr player = dynamic_pointer_cast( source->getEntity() ); + shared_ptr player = dynamic_pointer_cast( source->getEntity() ); if (player != NULL) { // reflected fireball, kill the ghast @@ -62,7 +62,7 @@ bool Ghast::hurt(DamageSource *source, int dmg) return FlyingMob::hurt(source, dmg); } -void Ghast::defineSynchedData() +void Ghast::defineSynchedData() { FlyingMob::defineSynchedData(); @@ -82,7 +82,7 @@ void Ghast::tick() this->textureIdx = current == 1 ? TN_MOB_GHAST_FIRE : TN_MOB_GHAST; } -void Ghast::serverAiStep() +void Ghast::serverAiStep() { if (!level->isClientSide && level->difficulty == Difficulty::PEACEFUL) remove(); checkDespawn(); @@ -107,7 +107,7 @@ void Ghast::serverAiStep() dd = sqrt(dd); - if (canReach(xTarget, yTarget, zTarget, dd)) + if (canReach(xTarget, yTarget, zTarget, dd)) { this->xd += xd / dd * 0.1; this->yd += yd / dd * 0.1; @@ -125,14 +125,14 @@ void Ghast::serverAiStep() if (target == NULL || retargetTime-- <= 0) { target = level->getNearestAttackablePlayer(shared_from_this(), 100); - if (target != NULL) + if (target != NULL) { retargetTime = 20; } } double maxDist = 64.0f; - if (target != NULL && target->distanceToSqr(shared_from_this()) < maxDist * maxDist) + if (target != NULL && target->distanceToSqr(shared_from_this()) < maxDist * maxDist) { double xdd = target->x - x; double ydd = (target->bb->y0 + target->bbHeight / 2) - (y + bbHeight / 2); @@ -151,7 +151,7 @@ void Ghast::serverAiStep() { // 4J - change brought forward from 1.2.3 level->levelEvent(nullptr, LevelEvent::SOUND_GHAST_FIREBALL, (int) x, (int) y, (int) z, 0); - std::shared_ptr ie = std::shared_ptr( new Fireball(level, dynamic_pointer_cast( shared_from_this() ), xdd, ydd, zdd) ); + shared_ptr ie = shared_ptr( new Fireball(level, dynamic_pointer_cast( shared_from_this() ), xdd, ydd, zdd) ); double d = 4; Vec3 *v = getViewVector(1); ie->x = x + v->x * d; @@ -160,8 +160,8 @@ void Ghast::serverAiStep() level->addEntity(ie); charge = -40; } - } - else + } + else { if (charge > 0) charge--; } @@ -172,7 +172,7 @@ void Ghast::serverAiStep() if (charge > 0) charge--; } - if (!level->isClientSide) + if (!level->isClientSide) { byte old = entityData->getByte(DATA_IS_CHARGING); byte current = (byte) (charge > 10 ? 1 : 0); @@ -183,7 +183,7 @@ void Ghast::serverAiStep() } } -bool Ghast::canReach(double xt, double yt, double zt, double dist) +bool Ghast::canReach(double xt, double yt, double zt, double dist) { double xd = (xTarget - x) / dist; double yd = (yTarget - y) / dist; @@ -214,7 +214,7 @@ int Ghast::getDeathSound() return eSoundType_MOB_GHAST_DEATH; } -int Ghast::getDeathLoot() +int Ghast::getDeathLoot() { return Item::sulphur->id; } -- cgit v1.2.3