fix: ガチャ景品リストを出力するコマンドで合計確率がおかしくなる不具合を修正

GiganticMinecraft · Oct 22, 2023 · f142cec · f142cec
1 parent adea1b2
commit f142cec
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/src/main/scala/com/github/unchama/seichiassist/subsystems/gacha/bukkit/GachaCommand.scala b/src/main/scala/com/github/unchama/seichiassist/subsystems/gacha/bukkit/GachaCommand.scala
@@ -244,12 +244,13 @@ class GachaCommand[F[_]: OnMinecraftServerThread: ConcurrentEffect](
       ContextualExecutorBuilder.beginConfiguration.buildWithExecutionCSEffect { context =>
         val eventName = context.args.yetToBeParsed.headOption.map(GachaEventName)
         Kleisli.liftF(gachaPrizeAPI.allGachaPrizeList).flatMap { gachaPrizes =>
-          val gachaPrizeInformation = gachaPrizes
-            .filter { gachaPrize =>
-              if (eventName.isEmpty) gachaPrize.nonGachaEventItem
-              else
-                gachaPrize.gachaEvent.map(_.eventName) == eventName
-            }
+          val eventGachaPrizes = gachaPrizes.filter { gachaPrize =>
+            if (eventName.isEmpty) gachaPrize.nonGachaEventItem
+            else
+              gachaPrize.gachaEvent.map(_.eventName) == eventName
+          }
+
+          val gachaPrizeInformation = eventGachaPrizes
             .sortBy(_.id.id)
             .map { gachaPrize =>
               val itemStack = gachaPrize.itemStack
@@ -261,7 +262,7 @@ class GachaCommand[F[_]: OnMinecraftServerThread: ConcurrentEffect](
             }
             .toList
 
-          val totalProbability = gachaPrizes.map(_.probability.value).sum
+          val totalProbability = eventGachaPrizes.map(_.probability.value).sum
           MessageEffectF(
             List(s"${RED}アイテム番号|アイテム名|アイテム数|出現確率") ++ gachaPrizeInformation ++ List(
               s"${RED}合計確率: $totalProbability(${totalProbability * 100}%)",