Skip to content

fix trigger halos not un-triggering for passive sources or sinks #803

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
DaFuqs merged 2 commits into from
Jan 16, 2026
Merged

fix trigger halos not un-triggering for passive sources or sinks #803

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
0a698b8
fix trigger halos not un-triggering for passive sources or sinks
Aquaeyes Jan 6, 2026
eb99a45
Keep the old exposed methods, just in case.
Aquaeyes Jan 9, 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
10 changes: 2 additions & 8 deletions src/main/java/de/dafuqs/spectrum/blocks/pastel_network/network/PastelTransmissionLogic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,14 +153,8 @@ private boolean transferBetween(PastelNodeBlockEntity sourceNode, Storage<ItemVa
this.network.addTransmission(transmission, travelTime);
SpectrumS2CPacketSender.sendPastelTransmissionParticle(this.network, travelTime, transmission);

if (transferMode == TransferMode.PULL) {
destinationNode.markTransferred();
} else if (transferMode == TransferMode.PUSH) {
sourceNode.markTransferred();
} else {
destinationNode.markTransferred();
sourceNode.markTransferred();
}
destinationNode.markTransferred(transferMode != TransferMode.PUSH);
sourceNode.markTransferred(transferMode != TransferMode.PULL);

destinationNode.addItemCountUnderway(transferrableAmount);
transaction.commit();
Expand Down
15 changes: 8 additions & 7 deletions src/main/java/de/dafuqs/spectrum/blocks/pastel_network/nodes/PastelNodeBlockEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,14 +327,15 @@ public boolean canTransfer() {

return canTransfer && notPowered;
}

public void markTransferred() {
if (triggerTransfer) {
markTriggered();
}

this.lastTransferTick = world.getTime();
this.markDirty();
markTransferred(true);
}

public void markTransferred(boolean setTransferCooldown) {
if (triggerTransfer) { markTriggered(); }
if (setTransferCooldown && world != null) { this.lastTransferTick = world.getTime(); }
if (triggerTransfer || setTransferCooldown) { this.markDirty(); }
}

@Override
Expand Down