vistaslayer/LegacyRenouveau
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: merge conflicts

Browse Source
This commit is contained in:
Fireblade
2026-05-24 23:20:13 -04:00
parent 8676650294
commit cc424e1fad
6 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.World/PistonBaseTile.cpp
+2 -2
View File
@@ -455,7 +455,7 @@ bool PistonBaseTile::triggerEvent(Level *level, int x, int y, int z, int param1,
int destZ = adjZ - Facing::STEP_Z[facing];
stopSharingIfServer(level, destX, destY, destZ);
level->setTileAndData(destX, destY, destZ, Tile::pistonMovingPiece_Id, adjData, Tile::UPDATE_NONE);
level->setTileAndData(destX, destY, destZ, Tile::piston_extension_Id, adjData, Tile::UPDATE_NONE);
level->setTileEntity(destX, destY, destZ, PistonMovingPiece::newMovingPieceEntity(adjBlock, adjData, facing, false, false));
ignoreUpdate(false);
@@ -852,7 +852,7 @@ bool PistonBaseTile::createPush(Level *level, int sx, int sy, int sz, int facing
int dz = nz + Facing::STEP_Z[facing];
stopSharingIfServer(level, dx, dy, dz);
level->setTileAndData(dx, dy, dz, Tile::pistonMovingPiece_Id, data, Tile::UPDATE_NONE);
level->setTileAndData(dx, dy, dz, Tile::piston_extension_Id, data, Tile::UPDATE_NONE);
level->setTileEntity(dx, dy, dz, PistonMovingPiece::newMovingPieceEntity(block, data, facing, true, false));
level->removeTile(nx, ny, nz);
level->updateNeighborsAt(nx, ny, nz, block);