Skip to content

Commit

Permalink
Merge pull request #1985 from GiganticMinecraft/develop
Browse files Browse the repository at this point in the history
バージョン 79 リリース
  • Loading branch information
rito528 authored May 11, 2023
2 parents d344029 + 00c69b6 commit aca2ea1
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 29 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/build_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,8 @@ jobs:
touch -t "$timestamp" $proto
done
- name: Check format with Scalafmt on push
if: ${{ (github.event_name == 'push')}}
- name: Check format with Scalafmt
run: sbt scalafmtCheckAll
- name: Run format with Scalafmt on PR
if: ${{ (github.event_name == 'pull_request')}}
run: sbt scalafmtAll
- name: Run reviewdog for Scalafmt
uses: ./.github/actions/run-reviewdog
if: ${{ (github.event_name == 'pull_request') && failure() }}
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import java.io._
ThisBuild / scalaVersion := "2.13.4"
// ThisBuild / version はGitHub Actionsによって取得/自動更新される。
// 次の行は ThisBuild / version := "(\d*)" の形式でなければならない。
ThisBuild / version := "78"
ThisBuild / version := "79"
ThisBuild / organization := "click.seichi"
ThisBuild / description := "ギガンティック☆整地鯖の独自要素を司るプラグイン"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -601,8 +601,6 @@ class SeichiAssist extends JavaPlugin() {
// パフォーマンスモニタリングに使うトレースサンプルの送信割合
// tracesSampleRateを1.0にすると全てのイベントが送られるため、送りすぎないように調整する必要がある
options.setTracesSampleRate(0.25)
// When first trying Sentry it's good to see what the SDK is doing:
options.setDebug(true)

// どのサーバーからイベントが送られているのかを判別する識別子
options.setEnvironment(SeichiAssist.seichiAssistConfig.getServerId)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,27 +79,33 @@ object RmpCommand {
val isSeichiWorldWithWGRegionsOption =
ManagedWorld.fromBukkitWorld(world).map(_.isSeichiWorldWithWGRegions)

isSeichiWorldWithWGRegionsOption match {
case None | Some(false) => MessageEffect(s"第1整地以外の保護をかけて整地する整地ワールドでのみ使用出来ます")
case Some(true) =>
getOldRegionsIn(world, days).map { removalTargets =>
removalTargets.foreach { target =>
ExternalPlugins
.getWorldGuard
.getRegionContainer
.get(world)
.removeRegion(target.getId)
}

// メッセージ生成
if (removalTargets.isEmpty) {
MessageEffect(s"${GREEN}該当Regionは存在しません")
} else {
targetedeffect.SequentialEffect(removalTargets.map { target =>
MessageEffect(s"$YELLOW[rmp] Deleted Region => ${world.getName}.${target.getId}")
})
}
}.merge
if (Bukkit.getServer.hasWhitelist) {
MessageEffect("ホワイトリストが有効なため、rmpコマンドは利用できません。")
} else {
isSeichiWorldWithWGRegionsOption match {
case None | Some(false) => MessageEffect(s"第1整地以外の保護をかけて整地する整地ワールドでのみ使用出来ます")
case Some(true) =>
getOldRegionsIn(world, days).map { removalTargets =>
removalTargets.foreach { target =>
ExternalPlugins
.getWorldGuard
.getRegionContainer
.get(world)
.removeRegion(target.getId)
}

// メッセージ生成
if (removalTargets.isEmpty) {
MessageEffect(s"${GREEN}該当Regionは存在しません")
} else {
targetedeffect.SequentialEffect(removalTargets.map { target =>
MessageEffect(
s"$YELLOW[rmp] Deleted Region => ${world.getName}.${target.getId}"
)
})
}
}.merge
}
}
}

Expand Down

0 comments on commit aca2ea1

Please sign in to comment.