From 8e0d3fee67984f7ab3d6eb67e9b843d1b91df863 Mon Sep 17 00:00:00 2001
From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Sun, 10 Mar 2024 13:01:52 -0700
Subject: [PATCH] Allow for simultaneously having both item and liquid
 efficiency multipliers

---
 .../mindustry/world/blocks/power/ConsumeGenerator.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/mindustry/world/blocks/power/ConsumeGenerator.java b/core/src/mindustry/world/blocks/power/ConsumeGenerator.java
index a3b29b4cfd..1347a2141e 100644
--- a/core/src/mindustry/world/blocks/power/ConsumeGenerator.java
+++ b/core/src/mindustry/world/blocks/power/ConsumeGenerator.java
@@ -80,12 +80,14 @@ public class ConsumeGenerator extends PowerGenerator{
 
         @Override
         public void updateEfficiencyMultiplier(){
+            efficiencyMultiplier = 1f;
             if(filterItem != null){
                 float m = filterItem.efficiencyMultiplier(this);
-                if(m > 0) efficiencyMultiplier = m;
-            }else if(filterLiquid != null){
+                if(m > 0) efficiencyMultiplier *= m;
+            }
+            if(filterLiquid != null){
                 float m = filterLiquid.efficiencyMultiplier(this);
-                if(m > 0) efficiencyMultiplier = m;
+                if(m > 0) efficiencyMultiplier *= m;
             }
         }