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:
@@ -13,8 +13,8 @@ SkullTileEntity::SkullTileEntity()
|
||||
void SkullTileEntity::save(CompoundTag *tag)
|
||||
{
|
||||
TileEntity::save(tag);
|
||||
tag->putByte(L"SkullType", static_cast<BYTE>(skullType & 0xff));
|
||||
tag->putByte(L"Rot", static_cast<BYTE>(rotation & 0xff));
|
||||
tag->putByte(L"SkullType", (BYTE) (skullType & 0xff));
|
||||
tag->putByte(L"Rot", (BYTE) (rotation & 0xff));
|
||||
tag->putString(L"ExtraType", extraType);
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ shared_ptr<Packet> SkullTileEntity::getUpdatePacket()
|
||||
{
|
||||
CompoundTag *tag = new CompoundTag();
|
||||
save(tag);
|
||||
return std::make_shared<TileEntityDataPacket>(x, y, z, TileEntityDataPacket::TYPE_SKULL, tag);
|
||||
return shared_ptr<TileEntityDataPacket>(new TileEntityDataPacket(x, y, z, TileEntityDataPacket::TYPE_SKULL, tag));
|
||||
}
|
||||
|
||||
void SkullTileEntity::setSkullType(int skullType, const wstring &extra)
|
||||
@@ -62,7 +62,7 @@ wstring SkullTileEntity::getExtraType()
|
||||
// 4J Added
|
||||
shared_ptr<TileEntity> SkullTileEntity::clone()
|
||||
{
|
||||
shared_ptr<SkullTileEntity> result = std::make_shared<SkullTileEntity>();
|
||||
shared_ptr<SkullTileEntity> result = shared_ptr<SkullTileEntity>( new SkullTileEntity() );
|
||||
TileEntity::clone(result);
|
||||
|
||||
result->skullType = skullType;
|
||||
|
||||
Reference in New Issue
Block a user