Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a.
This commit is contained in:
@@ -117,7 +117,7 @@ void PistonPieceEntity::moveCollidedEntities(float progress, float amount)
|
||||
}
|
||||
|
||||
AABB *aabb = Tile::pistonMovingPiece->getAABB(level, x, y, z, id, progress, facing);
|
||||
if (aabb != nullptr)
|
||||
if (aabb != NULL)
|
||||
{
|
||||
vector<shared_ptr<Entity> > *entities = level->getEntities(nullptr, aabb);
|
||||
if (!entities->empty())
|
||||
@@ -140,7 +140,7 @@ void PistonPieceEntity::moveCollidedEntities(float progress, float amount)
|
||||
|
||||
void PistonPieceEntity::finalTick()
|
||||
{
|
||||
if (progressO < 1 && level != nullptr)
|
||||
if (progressO < 1 && level != NULL)
|
||||
{
|
||||
progressO = progress = 1;
|
||||
level->removeTileEntity(x, y, z);
|
||||
@@ -207,7 +207,7 @@ void PistonPieceEntity::save(CompoundTag *tag)
|
||||
// 4J Added
|
||||
shared_ptr<TileEntity> PistonPieceEntity::clone()
|
||||
{
|
||||
shared_ptr<PistonPieceEntity> result = std::make_shared<PistonPieceEntity>();
|
||||
shared_ptr<PistonPieceEntity> result = shared_ptr<PistonPieceEntity>( new PistonPieceEntity() );
|
||||
TileEntity::clone(result);
|
||||
|
||||
result->id = id;
|
||||
|
||||
Reference in New Issue
Block a user