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:
parent
a9be52c41a
commit
087b7e7abf
1373 changed files with 19449 additions and 19903 deletions
|
|
@ -37,7 +37,7 @@ int MobSpawnerTileEntity::TileEntityMobSpawner::getZ()
|
|||
void MobSpawnerTileEntity::TileEntityMobSpawner::setNextSpawnData(BaseMobSpawner::SpawnData *nextSpawnData)
|
||||
{
|
||||
BaseMobSpawner::setNextSpawnData(nextSpawnData);
|
||||
if (getLevel() != nullptr) getLevel()->sendTileUpdated(m_parent->x, m_parent->y, m_parent->z);
|
||||
if (getLevel() != NULL) getLevel()->sendTileUpdated(m_parent->x, m_parent->y, m_parent->z);
|
||||
}
|
||||
|
||||
MobSpawnerTileEntity::MobSpawnerTileEntity()
|
||||
|
|
@ -73,7 +73,7 @@ shared_ptr<Packet> MobSpawnerTileEntity::getUpdatePacket()
|
|||
CompoundTag *tag = new CompoundTag();
|
||||
save(tag);
|
||||
tag->remove(L"SpawnPotentials");
|
||||
return std::make_shared<TileEntityDataPacket>(x, y, z, TileEntityDataPacket::TYPE_MOB_SPAWNER, tag);
|
||||
return shared_ptr<TileEntityDataPacket>( new TileEntityDataPacket(x, y, z, TileEntityDataPacket::TYPE_MOB_SPAWNER, tag) );
|
||||
}
|
||||
|
||||
bool MobSpawnerTileEntity::triggerEvent(int b0, int b1)
|
||||
|
|
@ -90,7 +90,7 @@ BaseMobSpawner *MobSpawnerTileEntity::getSpawner()
|
|||
// 4J Added
|
||||
shared_ptr<TileEntity> MobSpawnerTileEntity::clone()
|
||||
{
|
||||
shared_ptr<MobSpawnerTileEntity> result = std::make_shared<MobSpawnerTileEntity>();
|
||||
shared_ptr<MobSpawnerTileEntity> result = shared_ptr<MobSpawnerTileEntity>( new MobSpawnerTileEntity() );
|
||||
TileEntity::clone(result);
|
||||
|
||||
return result;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue