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/EnderMan.cpp | |
| parent | 8a2a62ea1d47364f802cf9aae97668bc4a7007b5 (diff) | |
Revert "shared_ptr -> std::shared_ptr"
This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5.
Diffstat (limited to 'Minecraft.World/EnderMan.cpp')
| -rw-r--r-- | Minecraft.World/EnderMan.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Minecraft.World/EnderMan.cpp b/Minecraft.World/EnderMan.cpp index e5995587..abfc5cb5 100644 --- a/Minecraft.World/EnderMan.cpp +++ b/Minecraft.World/EnderMan.cpp @@ -83,16 +83,16 @@ void EnderMan::readAdditionalSaveData(CompoundTag *tag) setCarryingData(tag->getShort(L"carryingData")); } -std::shared_ptr<Entity> EnderMan::findAttackTarget() +shared_ptr<Entity> EnderMan::findAttackTarget() { #ifndef _FINAL_BUILD if(app.GetMobsDontAttackEnabled()) { - return std::shared_ptr<Player>(); + return shared_ptr<Player>(); } #endif - std::shared_ptr<Player> player = level->getNearestAttackablePlayer(shared_from_this(), 64); + shared_ptr<Player> player = level->getNearestAttackablePlayer(shared_from_this(), 64); if (player != NULL) { if (isLookingAtMe(player)) @@ -112,9 +112,9 @@ std::shared_ptr<Entity> EnderMan::findAttackTarget() return nullptr; } -bool EnderMan::isLookingAtMe(std::shared_ptr<Player> player) +bool EnderMan::isLookingAtMe(shared_ptr<Player> player) { - std::shared_ptr<ItemInstance> helmet = player->inventory->armor[3]; + shared_ptr<ItemInstance> helmet = player->inventory->armor[3]; if (helmet != NULL && helmet->id == Tile::pumpkin_Id) return false; Vec3 *look = player->getViewVector(1)->normalize(); @@ -250,7 +250,7 @@ bool EnderMan::teleport() return teleport(xx, yy, zz); } -bool EnderMan::teleportTowards(std::shared_ptr<Entity> e) +bool EnderMan::teleportTowards(shared_ptr<Entity> e) { Vec3 *dir = Vec3::newTemp(x - e->x, bb->y0 + bbHeight / 2 - e->y + e->getHeadHeight(), z - e->z); dir = dir->normalize(); |
