From 0a698b8de4d419961ec2de5e9ad861f28aabb48c Mon Sep 17 00:00:00 2001
From: Aquaholic <rjja27@hotmail.com>
Date: Tue, 6 Jan 2026 17:01:40 +0800
Subject: [PATCH 1/2] fix trigger halos not un-triggering for passive sources
 or sinks

---
 .../network/PastelTransmissionLogic.java              | 10 ++--------
 .../pastel_network/nodes/PastelNodeBlockEntity.java   | 11 ++++-------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/main/java/de/dafuqs/spectrum/blocks/pastel_network/network/PastelTransmissionLogic.java b/src/main/java/de/dafuqs/spectrum/blocks/pastel_network/network/PastelTransmissionLogic.java
index fa28a1dbc7..1593d08819 100644
--- a/src/main/java/de/dafuqs/spectrum/blocks/pastel_network/network/PastelTransmissionLogic.java
+++ b/src/main/java/de/dafuqs/spectrum/blocks/pastel_network/network/PastelTransmissionLogic.java
@@ -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();
diff --git a/src/main/java/de/dafuqs/spectrum/blocks/pastel_network/nodes/PastelNodeBlockEntity.java b/src/main/java/de/dafuqs/spectrum/blocks/pastel_network/nodes/PastelNodeBlockEntity.java
index b18f76d04c..9f637b3a56 100644
--- a/src/main/java/de/dafuqs/spectrum/blocks/pastel_network/nodes/PastelNodeBlockEntity.java
+++ b/src/main/java/de/dafuqs/spectrum/blocks/pastel_network/nodes/PastelNodeBlockEntity.java
@@ -328,13 +328,10 @@ public boolean canTransfer() {
 		return canTransfer && notPowered;
 	}
 
-	public void markTransferred() {
-		if (triggerTransfer) {
-			markTriggered();
-		}
-
-		this.lastTransferTick = world.getTime();
-		this.markDirty();
+	public void markTransferred(boolean setTransferCooldown) {
+		if (triggerTransfer) { markTriggered(); }
+		if (setTransferCooldown && world != null) { this.lastTransferTick = world.getTime(); }
+		if (triggerTransfer || setTransferCooldown) { this.markDirty(); }
 	}
 
 	@Override

From eb99a457d1095642053fb7cbc50a3fd828928895 Mon Sep 17 00:00:00 2001
From: Aquaholic <rjja27@hotmail.com>
Date: Fri, 9 Jan 2026 10:13:30 +0800
Subject: [PATCH 2/2] Keep the old exposed methods, just in case.

---
 .../blocks/pastel_network/nodes/PastelNodeBlockEntity.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/de/dafuqs/spectrum/blocks/pastel_network/nodes/PastelNodeBlockEntity.java b/src/main/java/de/dafuqs/spectrum/blocks/pastel_network/nodes/PastelNodeBlockEntity.java
index 9f637b3a56..80449289f7 100644
--- a/src/main/java/de/dafuqs/spectrum/blocks/pastel_network/nodes/PastelNodeBlockEntity.java
+++ b/src/main/java/de/dafuqs/spectrum/blocks/pastel_network/nodes/PastelNodeBlockEntity.java
@@ -327,7 +327,11 @@ public boolean canTransfer() {
 
 		return canTransfer && notPowered;
 	}
-
+	
+	public void markTransferred() {
+		markTransferred(true);
+	}
+	
 	public void markTransferred(boolean setTransferCooldown) {
 		if (triggerTransfer) { markTriggered(); }
 		if (setTransferCooldown && world != null) { this.lastTransferTick = world.getTime(); }