backups/neoLegacy
2
0
Fork 0
mirror of https://github.com/neoStudiosLCE/neoLegacy.git synced 2026-08-20 09:57:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into exp/worldgen

Browse source
This commit is contained in:
github-actions 2026-05-22 11:08:24 +00:00
parent e5e1aa222a d7d38d4f8f
commit 581e288d6d
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Minecraft.World/TallGrass2.cpp
View file

@ -189,11 +189,12 @@ void TallGrass2::neighborChanged(Level* level, int x, int y, int z, int type)
if (!isUpper) if (!isUpper)
{ {
if (!canSurvive(level, x, y, z)) int upperTileId = level->getTile(x, y + 1, z);
if (!canSurvive(level, x, y, z) || (upperTileId != id))
{ {
spawnResources(level, x, y, z, data, 0); spawnResources(level, x, y, z, data, 0);
level->setTileAndData(x, y, z, 0, 0, Tile::UPDATE_CLIENTS); level->setTileAndData(x, y, z, 0, 0, Tile::UPDATE_CLIENTS);
if (level->getTile(x, y + 1, z) == id) if (upperTileId == id)
level->removeTile(x, y + 1, z); level->removeTile(x, y + 1, z);
} }
} }
@ -211,11 +212,12 @@ void TallGrass2::tick(Level* level, int x, int y, int z, Random* random)
if (!isUpper) if (!isUpper)
{ {
if (!canSurvive(level, x, y, z)) int upperTileId = level->getTile(x, y + 1, z);
if (!canSurvive(level, x, y, z) || (upperTileId != id))
{ {
spawnResources(level, x, y, z, data, 0); spawnResources(level, x, y, z, data, 0);
level->setTileAndData(x, y, z, 0, 0, Tile::UPDATE_CLIENTS); level->setTileAndData(x, y, z, 0, 0, Tile::UPDATE_CLIENTS);
if (level->getTile(x, y + 1, z) == id) if (upperTileId == id)
level->removeTile(x, y + 1, z); level->removeTile(x, y + 1, z);
} }
} }
@ -224,7 +226,6 @@ void TallGrass2::tick(Level* level, int x, int y, int z, Random* random)
int TallGrass2::getResource(int data, Random* random, int playerBonusLevel) int TallGrass2::getResource(int data, Random* random, int playerBonusLevel)
{ {
return -1; return -1;
} }
@ -240,7 +241,6 @@ bool TallGrass2::isSilkTouchable()
shared_ptr<ItemInstance> TallGrass2::getSilkTouchItemInstance(int data) shared_ptr<ItemInstance> TallGrass2::getSilkTouchItemInstance(int data)
{ {
if ((data & UPPER_BIT) != 0) return nullptr; if ((data & UPPER_BIT) != 0) return nullptr;
int variant = data & ~UPPER_BIT; int variant = data & ~UPPER_BIT;
return std::make_shared<ItemInstance>(this, 1, variant); return std::make_shared<ItemInstance>(this, 1, variant);