From bcee17a25c23405b6e936f3c8f4b9bb661318d97 Mon Sep 17 00:00:00 2001
From: Reece Mackie <20544390+Rover656@users.noreply.github.com>
Date: Thu, 3 Oct 2024 13:23:48 +0100
Subject: [PATCH] fix: Energy conduit outputs max transfer rate despite buffer
 contents

This is a certified #rovers-fault moment.
---
 .../common/conduit/type/energy/EnergyConduitTicker.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/enderio-conduits/src/main/java/com/enderio/conduits/common/conduit/type/energy/EnergyConduitTicker.java b/enderio-conduits/src/main/java/com/enderio/conduits/common/conduit/type/energy/EnergyConduitTicker.java
index bf884325b..c9251e792 100644
--- a/enderio-conduits/src/main/java/com/enderio/conduits/common/conduit/type/energy/EnergyConduitTicker.java
+++ b/enderio-conduits/src/main/java/com/enderio/conduits/common/conduit/type/energy/EnergyConduitTicker.java
@@ -31,8 +31,7 @@ public void tickColoredGraph(ServerLevel level, EnergyConduit conduit, List<Conn
             return;
         }
 
-        int availableEnergy = Math.max(context.energyStored(), 0);
-        if (availableEnergy == 0) {
+        if (context.energyStored() <= 0) {
             return;
         }
 
@@ -59,7 +58,8 @@ public void tickColoredGraph(ServerLevel level, EnergyConduit conduit, List<Conn
                 continue;
             }
 
-            int energyInserted = insertHandler.receiveEnergy(conduit.transferRate(), false);
+            int energyToInsert = Math.min(conduit.transferRate(), Math.max(context.energyStored(), 0));
+            int energyInserted = insertHandler.receiveEnergy(energyToInsert, false);
             context.setEnergyStored(context.energyStored() - energyInserted);
             context.setRotatingIndex(insertIndex + 1);
         }