Skip to content

fix: harden upstream-watch jq (broken pipe + invalid backtick escape) #8

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
Hermes-Enthusia wants to merge 2 commits into
base: fuji
Choose a base branch
from
Open

fix: harden upstream-watch jq (broken pipe + invalid backtick escape) #8

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
29daaf6
fix: bypass AsyncCatcher in CullTask entity iteration
Jul 9, 2026
dbd3c03
fix: harden upstream-watch jq (broken pipe + invalid backtick escape)
Aug 11, 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: 2 additions & 2 deletions .github/workflows/upstream-watch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
commit=$(gh api "repos/$REPO/commits/$BRANCH")
sha=$(jq -r '.sha' <<<"$commit")
short=${sha:0:7}
msg=$(jq -r '.commit.message' <<<"$commit" | head -1)
msg=$(jq -r '.commit.message | split("\n")[0]' <<<"$commit")
titlemsg=$(printf '%s' "$msg" | cut -c1-60)
author=$(jq -r '.commit.author.name' <<<"$commit")
date=$(jq -r '.commit.author.date' <<<"$commit")
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
del=$(jq -r '[.files[]?.deletions] | add // 0' <<<"$cmp")
nfiles=$(jq -r '[.files[]?] | length' <<<"$cmp")
stats="**$ncommits** commit(s) · **$nfiles** file(s) · **+$add / -$del**"
filelist=$(jq -r '.files[]? | "- `\(.status)` `\(.filename)` (+\(.additions)/-\(.deletions))"' <<<"$cmp" | head -30)
filelist=$(jq -r '[.files[]? | "- `\(.status)` `\(.filename)` (+\(.additions)/-\(.deletions))"] | .[:30] | join("\n")' <<<"$cmp")
fi

# Build the issue body
Expand Down
5 changes: 4 additions & 1 deletion leaf-server/src/main/java/dev/tr7zw/entityculling/CullTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.logisticscraft.occlusionculling.OcclusionCullingInstance;
import com.logisticscraft.occlusionculling.util.Vec3d;
import ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemLevel;
import ca.spottedleaf.moonrise.patches.chunk_system.level.entity.EntityLookup;
import dev.tr7zw.entityculling.versionless.access.Cullable;
import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
import it.unimi.dsi.fastutil.ints.IntSets;
Expand Down Expand Up @@ -126,7 +128,8 @@ public synchronized void run() {
}

private void cullEntities(Vec3 cameraMC, Vec3d camera) {
for (Entity entity : this.checkTarget.level().getEntities().getAll()) { // This one's safe here; moonrise returns an array for us to iterate
EntityLookup entityLookup = ((ChunkSystemLevel) this.checkTarget.level()).moonrise$getEntityLookup();
for (Entity entity : entityLookup.getAll()) {
if (!(entity instanceof Cullable cullable) || entity == this.checkTarget) {
continue;
}
Expand Down
Loading