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/CropTile.cpp
View file

@ -9,7 +9,7 @@ CropTile::CropTile(int id) : Bush(id)
{
setTicking(true);
updateDefaultShape();
icons = NULL;
icons = nullptr;
stages = 8;
setDestroyTime(0.0f);
@ -41,7 +41,7 @@ void CropTile::tick(Level *level, int x, int y, int z, Random *random)
{
float growthSpeed = getGrowthSpeed(level, x, y, z);
if (random->nextInt((int) (25 / growthSpeed) + 1) == 0)
if (random->nextInt(static_cast<int>(25 / growthSpeed) + 1) == 0)
{
age++;
level->setData(x, y, z, age, Tile::UPDATE_CLIENTS);
@ -137,7 +137,7 @@ void CropTile::spawnResources(Level *level, int x, int y, int z, int data, float
for (int i = 0; i < count; i++)
{
if (level->random->nextInt(5 * 3) > data) continue;
popResource(level, x, y, z, shared_ptr<ItemInstance>(new ItemInstance(getBaseSeedId(), 1, 0)));
popResource(level, x, y, z, std::make_shared<ItemInstance>(getBaseSeedId(), 1, 0));
}
}
}