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/EnderCrystal.cpp | |
| parent | 8a2a62ea1d47364f802cf9aae97668bc4a7007b5 (diff) | |
Revert "shared_ptr -> std::shared_ptr"
This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5.
Diffstat (limited to 'Minecraft.World/EnderCrystal.cpp')
| -rw-r--r-- | Minecraft.World/EnderCrystal.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Minecraft.World/EnderCrystal.cpp b/Minecraft.World/EnderCrystal.cpp index 7e43ef66..719e9d96 100644 --- a/Minecraft.World/EnderCrystal.cpp +++ b/Minecraft.World/EnderCrystal.cpp @@ -9,7 +9,7 @@ void EnderCrystal::_init(Level *level) -{ +{ // 4J Stu - This function call had to be moved here from the Entity ctor to ensure that // the derived version of the function is called this->defineSynchedData(); @@ -91,7 +91,7 @@ bool EnderCrystal::isPickable() bool EnderCrystal::hurt(DamageSource *source, int damage) { // 4J-PB - if the owner of the source is the enderdragon, then ignore it (where the dragon's fireball hits an endercrystal) - std::shared_ptr<EnderDragon> sourceIsDragon = dynamic_pointer_cast<EnderDragon>(source->getEntity()); + shared_ptr<EnderDragon> sourceIsDragon = dynamic_pointer_cast<EnderDragon>(source->getEntity()); if(sourceIsDragon!=NULL) { @@ -108,12 +108,12 @@ bool EnderCrystal::hurt(DamageSource *source, int damage) { level->explode(nullptr, x, y, z, 6, true); - vector<std::shared_ptr<Entity> > entities = level->getAllEntities(); - std::shared_ptr<EnderDragon> dragon = nullptr; + vector<shared_ptr<Entity> > entities = level->getAllEntities(); + shared_ptr<EnderDragon> dragon = nullptr; AUTO_VAR(itEnd, entities.end()); for (AUTO_VAR(it, entities.begin()); it != itEnd; it++) { - std::shared_ptr<Entity> e = *it; //entities->at(i); + shared_ptr<Entity> e = *it; //entities->at(i); dragon = dynamic_pointer_cast<EnderDragon>(e); if(dragon != NULL) { |