Merge pull request #2205 from GiganticMinecraft/develop

バージョン 86 リリース

build.sbt

@@ -8,7 +8,7 @@ import java.io._
 ThisBuild / scalaVersion := "2.13.11"
 // ThisBuild / version はGitHub Actionsによって取得/自動更新される。
 // 次の行は ThisBuild / version := "(\d*)" の形式でなければならない。
-ThisBuild / version := "85"
+ThisBuild / version := "86"
 ThisBuild / organization := "click.seichi"
 ThisBuild / description := "ギガンティック☆整地鯖の独自要素を司るプラグイン"
 

project/plugins.sbt

@@ -5,4 +5,4 @@ addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.2.0")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.0")
 
 // コードフォーマットするため
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")

src/main/scala/com/github/unchama/seichiassist/util/BreakUtil.scala

@@ -155,11 +155,15 @@ object BreakUtil {
    */
   private def canBreakBlockMadeFromQuartz(player: Player, targetBlock: Block): Boolean = {
     val materialType = targetBlock.getType
-    val isQuartzBlockOrQuartzStairs =
-      materialType == Material.QUARTZ_BLOCK || materialType == Material.QUARTZ_STAIRS
-    val isQuartzSlab = materialType == Material.STEP && targetBlock.getData == 7.toByte
-    val isMadeFromQuartz = isQuartzBlockOrQuartzStairs || isQuartzSlab
-    val canBreakBlockMadeFromQuartz = !isMadeFromQuartz && SeichiAssist
+    val isNotQuartzBlockAndQuartzStairs =
+      materialType != Material.QUARTZ_BLOCK && materialType != Material.QUARTZ_STAIRS
+    val isNotQuartzSlab = materialType != Material.STEP || targetBlock.getData != 7.toByte
+    val isNotMadeFromQuartz = isNotQuartzBlockAndQuartzStairs && isNotQuartzSlab
+    if (isNotMadeFromQuartz) {
+      return true
+    }
+
+    val canBreakBlockMadeFromQuartz = SeichiAssist
       .instance
       .breakSkillTargetConfigSystem
       .api