Skip to content

Commit f142cec

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

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

src/main/scala/com/github/unchama/seichiassist/subsystems/gacha/bukkit/GachaCommand.scala

+8-7
Original file line numberDiff line numberDiff line change
@@ -244,12 +244,13 @@ class GachaCommand[F[_]: OnMinecraftServerThread: ConcurrentEffect](
244244
ContextualExecutorBuilder.beginConfiguration.buildWithExecutionCSEffect { context =>
245245
val eventName = context.args.yetToBeParsed.headOption.map(GachaEventName)
246246
Kleisli.liftF(gachaPrizeAPI.allGachaPrizeList).flatMap { gachaPrizes =>
247-
val gachaPrizeInformation = gachaPrizes
248-
.filter { gachaPrize =>
249-
if (eventName.isEmpty) gachaPrize.nonGachaEventItem
250-
else
251-
gachaPrize.gachaEvent.map(_.eventName) == eventName
252-
}
247+
val eventGachaPrizes = gachaPrizes.filter { gachaPrize =>
248+
if (eventName.isEmpty) gachaPrize.nonGachaEventItem
249+
else
250+
gachaPrize.gachaEvent.map(_.eventName) == eventName
251+
}
252+
253+
val gachaPrizeInformation = eventGachaPrizes
253254
.sortBy(_.id.id)
254255
.map { gachaPrize =>
255256
val itemStack = gachaPrize.itemStack
@@ -261,7 +262,7 @@ class GachaCommand[F[_]: OnMinecraftServerThread: ConcurrentEffect](
261262
}
262263
.toList
263264

264-
val totalProbability = gachaPrizes.map(_.probability.value).sum
265+
val totalProbability = eventGachaPrizes.map(_.probability.value).sum
265266
MessageEffectF(
266267
List(s"${RED}アイテム番号|アイテム名|アイテム数|出現確率") ++ gachaPrizeInformation ++ List(
267268
s"${RED}合計確率: $totalProbability(${totalProbability * 100}%)",

0 commit comments

Comments
 (0)