Fix

Poke-cord · May 6, 2024 · aa65eb5 · aa65eb5
1 parent 3e70b24
commit aa65eb5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/kotlin/xyz/pokecord/bot/core/structures/pokemon/SpecialEvents.kt b/src/main/kotlin/xyz/pokecord/bot/core/structures/pokemon/SpecialEvents.kt
@@ -7,7 +7,7 @@ import java.time.format.DateTimeFormatter
 object SpecialEvents {
   private val catchableEventList by lazy {
     listOf(
-      EventPokemon( //pride 2023
+      /*EventPokemon( //pride 2023
         "Pride 2023",
         parseDateTime("2023-06-30 00:00:00"),
         parseDateTime("2023-07-31 00:00:00"),
@@ -153,7 +153,7 @@ object SpecialEvents {
             Pokemon.getByName("Pride Arctovish V2")!!
           ),
         )
-      ),
+      ),*/
       EventPokemon( //mayflowers 2024 week 1 - awareness
         "Mayflowers 2024",
         parseDateTime("2024-05-06 07:00:00"),

diff --git a/src/main/kotlin/xyz/pokecord/bot/modules/trainer/commands/CatchCommand.kt b/src/main/kotlin/xyz/pokecord/bot/modules/trainer/commands/CatchCommand.kt
@@ -76,7 +76,7 @@ class CatchCommand : Command() {
         val finalPokemonId = eventPokemonId ?: pokemon.id
 
         val finalPokemon = Pokemon.getById(finalPokemonId)
-        val shiny = if (finalPokemon?.hasShiny == true) {
+        val shiny = if (finalPokemon!!.hasShiny) {
           eventPokemonId?.let {
             Random.nextInt(100) < 2
           }