diff options
| author | void_17 <heroerror3@gmail.com> | 2026-03-02 17:37:16 +0700 |
|---|---|---|
| committer | void_17 <heroerror3@gmail.com> | 2026-03-02 17:37:16 +0700 |
| commit | 119bff351450ea16ffda550b6e0f67379b29f708 (patch) | |
| tree | d9f28714afd516bc2450f33b0a77c5e05ff4de90 /Minecraft.World/EnderDragon.h | |
| parent | 8a2a62ea1d47364f802cf9aae97668bc4a7007b5 (diff) | |
Revert "shared_ptr -> std::shared_ptr"
This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5.
Diffstat (limited to 'Minecraft.World/EnderDragon.h')
| -rw-r--r-- | Minecraft.World/EnderDragon.h | 36 |
1 files changed, 18 insertions, 18 deletions
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<std::shared_ptr<Entity> > subEntities; - std::shared_ptr<BossMobPart> head; - std::shared_ptr<BossMobPart> neck; // 4J Added - std::shared_ptr<BossMobPart> body; - std::shared_ptr<BossMobPart> tail1; - std::shared_ptr<BossMobPart> tail2; - std::shared_ptr<BossMobPart> tail3; - std::shared_ptr<BossMobPart> wing1; - std::shared_ptr<BossMobPart> wing2; + vector<shared_ptr<Entity> > subEntities; + shared_ptr<BossMobPart> head; + shared_ptr<BossMobPart> neck; // 4J Added + shared_ptr<BossMobPart> body; + shared_ptr<BossMobPart> tail1; + shared_ptr<BossMobPart> tail2; + shared_ptr<BossMobPart> tail3; + shared_ptr<BossMobPart> wing1; + shared_ptr<BossMobPart> wing2; float oFlapTime; float flapTime; @@ -99,13 +99,13 @@ private: static const int PODIUM_Z_POS = 0; private: - std::shared_ptr<Entity> attackTarget; + shared_ptr<Entity> attackTarget; public: int dragonDeathTime; public: - std::shared_ptr<EnderCrystal> nearestCrystal; + shared_ptr<EnderCrystal> nearestCrystal; private: void _init(); @@ -126,14 +126,14 @@ private: void checkCrystals(); void checkAttack(); - void knockBack(vector<std::shared_ptr<Entity> > *entities); - void hurt(vector<std::shared_ptr<Entity> > *entities); + void knockBack(vector<shared_ptr<Entity> > *entities); + void hurt(vector<shared_ptr<Entity> > *entities); void findNewTarget(); float rotWrap(double d); bool checkWalls(AABB *bb); public: - virtual bool hurt(std::shared_ptr<BossMobPart> bossMobPart, DamageSource *source, int damage); + virtual bool hurt(shared_ptr<BossMobPart> bossMobPart, DamageSource *source, int damage); protected: virtual void tickDeath(); @@ -145,7 +145,7 @@ protected: virtual void checkDespawn(); virtual int getHurtSound(); public: - virtual vector<std::shared_ptr<Entity> > *getSubEntities(); + virtual vector<shared_ptr<Entity> > *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); |
