Skip to content

Commit

Permalink
Merge branch 'develop' into 1_18
Browse files Browse the repository at this point in the history
  • Loading branch information
outductor authored Jul 13, 2023
2 parents 7adc7f8 + 14280aa commit 9e813d0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ val dependenciesToEmbed = Seq(
"com.github.KisaragiEffective" % "ajd4jp-mirror" % "8.0.2.2021",

// Sentry
"io.sentry" % "sentry" % "6.25.0"
"io.sentry" % "sentry" % "6.25.1"
)

// endregion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ class PlayerInventoryListener(
// エラー分岐
val inventory = event.getInventory

// インベントリサイズが36でない時終了
if (inventory.row != 4) return
// インベントリサイズが54でない時終了
if (inventory.row != 6) return

if (event.getView.getTitle != s"$LIGHT_PURPLE${BOLD}交換したい鉱石を入れてください") return

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ object FirstPage extends Menu {
// TODO メニューに置き換える
openInventoryEffect(
InventoryUtil.createInventory(
size = 4.chestRows,
size = 6.chestRows,
title = Some(s"$LIGHT_PURPLE${BOLD}交換したい鉱石を入れてください")
)
)
Expand Down

0 comments on commit 9e813d0

Please sign in to comment.