aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/Explosion.cpp
diff options
context:
space:
mode:
authorvoid_17 <heroerror3@gmail.com>2026-03-02 17:37:16 +0700
committervoid_17 <heroerror3@gmail.com>2026-03-02 17:37:16 +0700
commit119bff351450ea16ffda550b6e0f67379b29f708 (patch)
treed9f28714afd516bc2450f33b0a77c5e05ff4de90 /Minecraft.World/Explosion.cpp
parent8a2a62ea1d47364f802cf9aae97668bc4a7007b5 (diff)
Revert "shared_ptr -> std::shared_ptr"
This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5.
Diffstat (limited to 'Minecraft.World/Explosion.cpp')
-rw-r--r--Minecraft.World/Explosion.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/Minecraft.World/Explosion.cpp b/Minecraft.World/Explosion.cpp
index c3facfe7..604813b7 100644
--- a/Minecraft.World/Explosion.cpp
+++ b/Minecraft.World/Explosion.cpp
@@ -8,7 +8,7 @@
#include "Explosion.h"
#include "SoundTypes.h"
-Explosion::Explosion(Level *level, std::shared_ptr<Entity> source, double x, double y, double z, float r)
+Explosion::Explosion(Level *level, shared_ptr<Entity> source, double x, double y, double z, float r)
{
fire = false;
random = new Random();
@@ -97,14 +97,14 @@ void Explosion::explode()
// Fix for 360 #123866 - [CRASH] TU13: Code: Compliance: Placing the TNT next to Ender Crystals will crash the title after a certain amount of time.
// If we explode something next to an EnderCrystal then it creates a new explosion that overwrites the shared vector in the level
// So copy it here instead of directly using the shared one
- vector<std::shared_ptr<Entity> > *levelEntities = level->getEntities(source, AABB::newTemp(x0, y0, z0, x1, y1, z1));
- vector<std::shared_ptr<Entity> > entities(levelEntities->begin(), levelEntities->end() );
+ vector<shared_ptr<Entity> > *levelEntities = level->getEntities(source, AABB::newTemp(x0, y0, z0, x1, y1, z1));
+ vector<shared_ptr<Entity> > entities(levelEntities->begin(), levelEntities->end() );
Vec3 *center = Vec3::newTemp(x, y, z);
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);
// 4J Stu - If the entity is not in a block that would be blown up, then they should not be damaged
// Fix for #46606 - TU5: Content: Gameplay: The player can be damaged and killed by explosions behind obsidian walls
@@ -147,9 +147,9 @@ void Explosion::explode()
double push = pow;
e->xd += xa * push;
e->yd += ya * push;
- e->zd += za * push;
+ e->zd += za * push;
- std::shared_ptr<Player> player = dynamic_pointer_cast<Player>(e);
+ shared_ptr<Player> player = dynamic_pointer_cast<Player>(e);
if (player != NULL)
{
//app.DebugPrintf("Adding player knockback (%f,%f,%f)\n", xa * pow, ya * pow, za * pow);
@@ -255,7 +255,7 @@ Explosion::playerVec3Map *Explosion::getHitPlayers()
return &hitPlayers;
}
-Vec3 *Explosion::getHitPlayerKnockback( std::shared_ptr<Player> player )
+Vec3 *Explosion::getHitPlayerKnockback( shared_ptr<Player> player )
{
AUTO_VAR(it, hitPlayers.find(player));