aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/PistonPieceEntity.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Minecraft.World/PistonPieceEntity.cpp')
-rw-r--r--Minecraft.World/PistonPieceEntity.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Minecraft.World/PistonPieceEntity.cpp b/Minecraft.World/PistonPieceEntity.cpp
index 99b9e5ca..3498cec0 100644
--- a/Minecraft.World/PistonPieceEntity.cpp
+++ b/Minecraft.World/PistonPieceEntity.cpp
@@ -119,10 +119,10 @@ void PistonPieceEntity::moveCollidedEntities(float progress, float amount)
AABB *aabb = Tile::pistonMovingPiece->getAABB(level, x, y, z, id, progress, facing);
if (aabb != NULL)
{
- vector<std::shared_ptr<Entity> > *entities = level->getEntities(nullptr, aabb);
+ vector<shared_ptr<Entity> > *entities = level->getEntities(nullptr, aabb);
if (!entities->empty())
{
- vector< std::shared_ptr<Entity> > collisionHolder;
+ vector< shared_ptr<Entity> > collisionHolder;
for( AUTO_VAR(it, entities->begin()); it != entities->end(); it++ )
{
collisionHolder.push_back(*it);
@@ -199,9 +199,9 @@ void PistonPieceEntity::save(CompoundTag *tag)
}
// 4J Added
-std::shared_ptr<TileEntity> PistonPieceEntity::clone()
+shared_ptr<TileEntity> PistonPieceEntity::clone()
{
- std::shared_ptr<PistonPieceEntity> result = std::shared_ptr<PistonPieceEntity>( new PistonPieceEntity() );
+ shared_ptr<PistonPieceEntity> result = shared_ptr<PistonPieceEntity>( new PistonPieceEntity() );
TileEntity::clone(result);
result->id = id;