Merge remote-tracking branch 'origin/master'

2020-10-29 10:26:35 -04:00
parent 77e6030c59 79624ff7cd
commit 2ad14cc884
1 changed files with 1 additions and 1 deletions
--- a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
@@ -144,7 +144,7 @@ public class LiquidTurret extends Turret{
        @Override
        public boolean acceptLiquid(Building source, Liquid liquid){
            return ammoTypes.get(liquid) != null
-                && (liquids.current() == liquid || (ammoTypes.containsKey(liquids.current())
+                && (liquids.current() == liquid || (ammoTypes.containsKey(liquid)
                && liquids.get(liquids.current()) <= 1f / ammoTypes.get(liquids.current()).ammoMultiplier + 0.001f));
        }
    }