phaneron/MinecraftConsoles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge with upstream

Browse source
This commit is contained in:
Soggy_Pancake 2026-03-14 14:51:06 -07:00
commit ad1a4ecc68
2031 changed files with 40476 additions and 27116 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Minecraft.World/EnchantmentTableTile.cpp
View file

@ -14,8 +14,8 @@ EnchantmentTableTile::EnchantmentTableTile(int id) : BaseEntityTile(id, Material
updateDefaultShape();
setLightBlock(0);
iconTop = NULL;
iconBottom = NULL;
iconTop = nullptr;
iconBottom = nullptr;
}
// 4J Added override
@ -69,7 +69,7 @@ Icon *EnchantmentTableTile::getTexture(int face, int data)
shared_ptr<TileEntity> EnchantmentTableTile::newTileEntity(Level *level)
{
return shared_ptr<TileEntity>(new EnchantmentTableEntity());
return std::make_shared<EnchantmentTableEntity>();
}
bool EnchantmentTableTile::use(Level *level, int x, int y, int z, shared_ptr<Player> player, int clickedFace, float clickX, float clickY, float clickZ, bool soundOnly/*=false*/) // 4J added soundOnly param