Skip to content

perf: read grave tags without copying the chest on hopper moves #136

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

Merged
XxFran10xX merged 2 commits into from
Oct 23, 2026
Merged

perf: read grave tags without copying the chest on hopper moves #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f4e074
perf: read grave tags without copying the chest on hopper moves
XxFran10xX Oct 22, 2026
3699fad
test: check the grave tag itself is read from the live block entity
XxFran10xX Oct 23, 2026
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
4 changes: 3 additions & 1 deletion src/main/java/net/tfminecraft/rpcharacters/grave/GraveManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ public Grave getAt(Block block) {
if (block == null) {
return null;
}
if (block.getState() instanceof TileState tile) {
// Hopper moves call this for every transfer. A snapshot copies the whole chest
// inventory just to read one tag, so read the live block entity instead.
if (block.getState(false) instanceof TileState tile) {
String raw = tile.getPersistentDataContainer().get(GraveKeys.graveId(), GraveKeys.GRAVE_ID_TYPE);
if (raw != null && !raw.isBlank()) {
try {
Expand Down
13 changes: 13 additions & 0 deletions src/test/java/net/tfminecraft/rpcharacters/grave/GraveManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,19 @@ ItemStack namedItem() {
assertSame(grave, manager.getAt(grave.getBlockLocation().getBlock()));
}

@Test void taggedLookupReadsTheLiveBlockEntityWithoutCopyingTheChest() {
Grave grave = grave(3, 64, 3); manager.register(grave);
Block block = mock(Block.class); TileState live = mock(TileState.class, RETURNS_DEEP_STUBS);
when(block.getWorld()).thenReturn(world); when(block.getX()).thenReturn(3); when(block.getY()).thenReturn(64); when(block.getZ()).thenReturn(3);
when(block.getState(false)).thenReturn(live);
when(live.getPersistentDataContainer().get(GraveKeys.graveId(), GraveKeys.GRAVE_ID_TYPE)).thenReturn(grave.getId().toString());
assertSame(grave, manager.getAt(block)); assertTrue(manager.isGrave(block));
// The grave is also indexed at these coordinates, so check the tag itself was read.
verify(block, times(2)).getState(false);
verify(live.getPersistentDataContainer(), times(2)).get(GraveKeys.graveId(), GraveKeys.GRAVE_ID_TYPE);
verify(block, never()).getState();
}

@Test void staleBlockTagsCannotExposeLootFromAMovedGrave() {
Grave grave = grave(1, 64, 1); Block previous = grave.getBlockLocation().getBlock(); previous.setType(Material.CHEST);
manager.save(grave); grave.setBlockLocation(new Location(world, 9, 64, 9)); manager.register(grave);
Expand Down
Loading