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/EnderDragon.h | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'Minecraft.World/EnderDragon.h') diff --git a/Minecraft.World/EnderDragon.h b/Minecraft.World/EnderDragon.h index 93a352c5..8a12c08c 100644 --- a/Minecraft.World/EnderDragon.h +++ b/Minecraft.World/EnderDragon.h @@ -16,7 +16,7 @@ public: private: static const int DATA_ID_SYNCHED_HEALTH = 16; - + // 4J Added for new behaviours static const int DATA_ID_SYNCHED_ACTION = 17; @@ -28,15 +28,15 @@ public: int posPointer; //BossMobPart[] subEntities; - vector > subEntities; - std::shared_ptr head; - std::shared_ptr neck; // 4J Added - std::shared_ptr body; - std::shared_ptr tail1; - std::shared_ptr tail2; - std::shared_ptr tail3; - std::shared_ptr wing1; - std::shared_ptr wing2; + vector > subEntities; + shared_ptr head; + shared_ptr neck; // 4J Added + shared_ptr body; + shared_ptr tail1; + shared_ptr tail2; + shared_ptr tail3; + shared_ptr wing1; + shared_ptr wing2; float oFlapTime; float flapTime; @@ -99,13 +99,13 @@ private: static const int PODIUM_Z_POS = 0; private: - std::shared_ptr attackTarget; + shared_ptr attackTarget; public: int dragonDeathTime; public: - std::shared_ptr nearestCrystal; + shared_ptr nearestCrystal; private: void _init(); @@ -126,14 +126,14 @@ private: void checkCrystals(); void checkAttack(); - void knockBack(vector > *entities); - void hurt(vector > *entities); + void knockBack(vector > *entities); + void hurt(vector > *entities); void findNewTarget(); float rotWrap(double d); bool checkWalls(AABB *bb); public: - virtual bool hurt(std::shared_ptr bossMobPart, DamageSource *source, int damage); + virtual bool hurt(shared_ptr bossMobPart, DamageSource *source, int damage); protected: virtual void tickDeath(); @@ -145,7 +145,7 @@ protected: virtual void checkDespawn(); virtual int getHurtSound(); public: - virtual vector > *getSubEntities(); + virtual vector > *getSubEntities(); virtual bool isPickable(); virtual int getSynchedHealth(); @@ -161,10 +161,10 @@ private: void strafeAttackTarget(); void navigateToNextPathNode(); -public: +public: virtual void addAdditonalSaveData(CompoundTag *entityTag); virtual void readAdditionalSaveData(CompoundTag *tag); - + public: void handleCrystalDestroyed(DamageSource *source); -- cgit v1.2.3