Merge pull request #3314 from ChemiHatake/master

Forgot to remove all the debug code
NecronomiconCoding · Aug 8, 2016 · a27f738 · a27f738
2 parents 55fbbea + db592c3
commit a27f738
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/PoGo.NecroBot.Logic/Tasks/EvolvePokemonTask.cs b/PoGo.NecroBot.Logic/Tasks/EvolvePokemonTask.cs
@@ -62,15 +62,16 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
                             return;
                         }
                     }
-                    if(eggNeededToEvolve <= deltaCount)
+                    if(eggNeededToEvolve <= deltaCount || !session.LogicSettings.KeepPokemonsThatCanEvolve)
                     {
-                        if (eggNeededToEvolve > 0 || !session.LogicSettings.KeepPokemonsThatCanEvolve)
+                        if (eggNeededToEvolve > 0)
                         {
                             session.EventDispatcher.Send(new UpdateEvent()
                             {
                                 Message = session.Translation.GetTranslation(TranslationString.CatchMorePokemonToUseLuckyEgg,
                                     eggNeededToEvolve)
                             });
+                            return;
                         }
                     }
                     else
@@ -82,9 +83,9 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
                                 Message = session.Translation.GetTranslation(TranslationString.WaitingForMorePokemonToEvolve,
                                     pokemonToEvolve.Count, deltaCount, totalPokemon.Count(), needPokemonToStartEvolve, session.LogicSettings.EvolveKeptPokemonsAtStorageUsagePercentage)
                             });
+                            return;
                         }
                     }
-                    return;
                 }
                 if (await shouldUseLuckyEgg(session, pokemonToEvolve))
                 {