Skip to content

perf: look only at pedestals when finding a meditation circle #73

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 1 commit into from
Oct 30, 2026
Merged

perf: look only at pedestals when finding a meditation circle #73

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
20 changes: 13 additions & 7 deletions src/main/java/net/tfminecraft/magic/meditation/MeditationCircle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,11 @@ public static MeditationCircle detect(Location sitLocation) {
World world = sitLocation.getWorld();

int[][] offsets = ringOffsets();
List<Furniture> candidates = collectNearby(world, cx, cz);
List<Furniture> candidates = nearbyPedestals(world, cx, cz);
// Every post takes a pedestal of its own, so fewer pedestals than posts never make a ring.
if (candidates.size() < offsets.length) {
return null;
}
List<Furniture> matched = new ArrayList<>();
for (int[] offset : offsets) {
Furniture found = matchAt(candidates, cx + offset[0], cy, cz + offset[1], matched);
Expand Down Expand Up @@ -391,10 +395,7 @@ private static Furniture matchAt(
Furniture best = null;
double bestDist = 0.75;
for (Furniture furniture : candidates) {
if (already.contains(furniture) || furniture.isCarried()) {
continue;
}
if (!MeditationCache.pedestalId.equalsIgnoreCase(furniture.getId())) {
if (already.contains(furniture)) {
continue;
}
Location anchor = furniture.getOriginBlockLocation().orElse(furniture.getLoc());
Expand All @@ -415,7 +416,8 @@ private static Furniture matchAt(
return best;
}

private static List<Furniture> collectNearby(World world, int cx, int cz) {
/** The pedestals, not carried, in the sit's chunk and the eight around it. */
private static List<Furniture> nearbyPedestals(World world, int cx, int cz) {
List<Furniture> out = new ArrayList<>();
InteractibleFurniture plugin = InteractibleFurniture.getInstance();
int chunkX = cx >> 4;
Expand All @@ -426,7 +428,11 @@ private static List<Furniture> collectNearby(World world, int cx, int cz) {
continue; // an unloaded chunk holds no live furniture; never load one here
}
Chunk chunk = world.getChunkAt(chunkX + dx, chunkZ + dz);
out.addAll(plugin.getFurnitureManager().getFurnitureInChunk(chunk));
for (Furniture furniture : plugin.getFurnitureManager().getFurnitureInChunk(chunk)) {
if (!furniture.isCarried() && MeditationCache.pedestalId.equalsIgnoreCase(furniture.getId())) {
out.add(furniture);
}
}
}
}
return out;
Expand Down
Loading