From e154d9bab0510c8bcf4bc558e2abce72cf78c795 Mon Sep 17 00:00:00 2001
From: MerlionRock <merlionrock@yahoo.com.sg>
Date: Tue, 24 Oct 2017 10:44:46 +0800
Subject: [PATCH] Minor Fixes

1. Fixed a bug that doesn't allow bot to bypass warning when "bypass_warning" has been set to true
2. Fix api versioning in runMultiBot.sh
---
 pokecli.py     | 2 +-
 runMultiBot.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pokecli.py b/pokecli.py
index b206563485..fbb8499945 100644
--- a/pokecli.py
+++ b/pokecli.py
@@ -123,7 +123,7 @@ def initialize(config):
             if killswitch_data['show_warning']:
                 yn=None
                 while yn==None:
-                    if killswitch_data['pause_bot'] or not bypass_warning:
+                    if killswitch_data['pause_bot'] and not bypass_warning:
                         yn = yes_no("\033[91mMessage: " + format(killswitch_data['message'])+ "\033[0m\nDo you wish to continue? Y/N")
                     else:
                         print "\033[91mMessage: " + format(killswitch_data['message']) + "\033[0m\n"
diff --git a/runMultiBot.sh b/runMultiBot.sh
index 847c5a7f89..ecf81d475b 100755
--- a/runMultiBot.sh
+++ b/runMultiBot.sh
@@ -10,7 +10,7 @@ then
 fi
 git fetch -a
 installed=(`pip list 2>/dev/null |sed -e 's/ //g' -e 's/(/:/' -e 's/)//' -e 's/[-_]//g' | awk '{print tolower($0)}'`)
-required=(`cat requirements.txt | sed -e 's/.*pgoapi$/pgoapi==2.13.0/' -e 's/[-_]//g' -e 's/==\(.*\)/:\1/' | awk '{print tolower($0)}'`)
+required=(`cat requirements.txt | sed -e 's/.*pgoapi$/pgoapi==2.14.0/' -e 's/[-_]//g' -e 's/==\(.*\)/:\1/' | awk '{print tolower($0)}'`)
 for package in ${required[@]}
 do
   if [[ ! (${installed[*]} =~ $package) ]];