Skip to content

Improve assembly block handling to prevent item duplication #632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SAILQAQ wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −13
Open

Improve assembly block handling to prevent item duplication #632

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions common/src/main/java/dev/ryanhcode/sable/api/SubLevelAssemblyHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.FullChunkStatus;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.Clearable;
import net.minecraft.world.RandomizableContainer;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.decoration.HangingEntity;
import net.minecraft.world.level.ChunkPos;
Expand Down Expand Up @@ -346,13 +344,8 @@ public static void moveBlocks(final ServerLevel level, final AssemblyTransform t
tag.putInt("x", newPos.getX());
tag.putInt("y", newPos.getY());
tag.putInt("z", newPos.getZ());
}

if (blockEntity instanceof final RandomizableContainer container) {
container.setLootTable(null);
}
if (blockEntity instanceof final Clearable clearable) {
clearable.clearContent();
level.removeBlockEntity(block);
}

final LevelChunk chunk = resultingAccelerator.getChunk(SectionPos.blockToSectionCoord(newPos.getX()), SectionPos.blockToSectionCoord(newPos.getZ()));
Expand Down Expand Up @@ -391,17 +384,27 @@ public static void moveBlocks(final ServerLevel level, final AssemblyTransform t
}

SableAssemblyPlatform.INSTANCE.setIgnoreOnPlace(resultingLevel, true);
// destroy all the old blocks
// Replace all old blocks as barriers temporarily to prevent any brittle blocks from breaking.
for (final BlockPos block : blocks) {
final BlockState subLevelState = Blocks.AIR.defaultBlockState();

try {
final LevelChunk chunk = accelerator.getChunk(SectionPos.blockToSectionCoord(block.getX()),
SectionPos.blockToSectionCoord(block.getZ()));

chunk.setBlockState(block, subLevelState, true);
chunk.setBlockState(block, Blocks.BARRIER.defaultBlockState(), true);
} catch (final Exception e) {
Sable.LOGGER.error("Failed to replace old block into a temporary barrier during assembly {}", block, e);
}
}

// Destroy all temporary barriers with flags to suppress drops.
for (final BlockPos block : blocks) {
final BlockState subLevelState = Blocks.AIR.defaultBlockState();

try {
level.setBlock(block, subLevelState,
Block.UPDATE_MOVE_BY_PISTON | Block.UPDATE_SUPPRESS_DROPS | Block.UPDATE_CLIENTS);
} catch (final Exception e) {
Sable.LOGGER.error("Failed to destroy old block during assembly {}", block, e);
Sable.LOGGER.error("Failed to destroy temporary barrier during assembly {}", block, e);
}
}
SableAssemblyPlatform.INSTANCE.setIgnoreOnPlace(resultingLevel, false);
Expand Down