From bdf4070ed6cdfa0dcfafe7e04dbb78b8382834f8 Mon Sep 17 00:00:00 2001 From: Lucky Date: Sat, 11 Feb 2023 15:22:10 +0900 Subject: [PATCH 1/5] ci: fix commit message when release --- .github/workflows/create_new_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create_new_release.yml b/.github/workflows/create_new_release.yml index 375754a751..3f12f1bf3e 100644 --- a/.github/workflows/create_new_release.yml +++ b/.github/workflows/create_new_release.yml @@ -61,7 +61,7 @@ jobs: TOKEN=${{ secrets.VERSION_BUMP_WORKFLOW_PUSH_TOKEN }} git add -A - git commit -m "[bump] ${{ steps.bump.outputs.old_version }} -> ${{ steps.bump.outputs.new_version }}" + git commit -m "chore(bump): ${{ steps.bump.outputs.old_version }} -> ${{ steps.bump.outputs.new_version }}" # masterへのマージはブランチが最新であることが要求されるため、ここでマージしておく git fetch origin master From a639229e367268ea6b0e569f15813e64c065b1c6 Mon Sep 17 00:00:00 2001 From: Lucky3028 Date: Tue, 14 Feb 2023 14:37:34 +0900 Subject: [PATCH 2/5] =?UTF-8?q?fix(valentine):=20=E3=82=AF=E3=83=AA?= =?UTF-8?q?=E3=83=BC=E3=83=91=E3=83=BC=E3=81=8C=E6=AD=BB=E4=BA=A1=E3=81=97?= =?UTF-8?q?=E3=81=9F=E3=81=93=E3=81=A8=E3=81=AB=E3=81=AF=E3=81=AA=E3=81=A3?= =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84=E3=81=AE=E3=81=A7=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E5=88=86=E5=B2=90=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../subsystems/seasonalevents/valentine/ValentineListener.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/com/github/unchama/seichiassist/subsystems/seasonalevents/valentine/ValentineListener.scala b/src/main/scala/com/github/unchama/seichiassist/subsystems/seasonalevents/valentine/ValentineListener.scala index e8f96aed17..ff777720ae 100644 --- a/src/main/scala/com/github/unchama/seichiassist/subsystems/seasonalevents/valentine/ValentineListener.scala +++ b/src/main/scala/com/github/unchama/seichiassist/subsystems/seasonalevents/valentine/ValentineListener.scala @@ -41,7 +41,7 @@ class ValentineListener[F[_]: ConcurrentEffect: NonServerThreadContextShift]( if (!isInEvent) return event.getEntity match { - case monster: Monster if monster.isDead && monster.getType == EntityType.CREEPER => + case monster: Monster if monster.getType == EntityType.CREEPER => randomlyDropItemAt(monster, droppedCookie, itemDropRate) case _ => } From 9f48ad7a7987f3fe30c8013dbae54674ed8f9255 Mon Sep 17 00:00:00 2001 From: Lucky3028 Date: Tue, 14 Feb 2023 14:39:34 +0900 Subject: [PATCH 3/5] =?UTF-8?q?refactor(valentine):=20=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E5=9E=8B=E3=82=92=E3=82=AD=E3=83=A3=E3=82=B9=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../seasonalevents/valentine/ValentineListener.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/scala/com/github/unchama/seichiassist/subsystems/seasonalevents/valentine/ValentineListener.scala b/src/main/scala/com/github/unchama/seichiassist/subsystems/seasonalevents/valentine/ValentineListener.scala index ff777720ae..90fed3110a 100644 --- a/src/main/scala/com/github/unchama/seichiassist/subsystems/seasonalevents/valentine/ValentineListener.scala +++ b/src/main/scala/com/github/unchama/seichiassist/subsystems/seasonalevents/valentine/ValentineListener.scala @@ -18,7 +18,7 @@ import de.tr7zw.itemnbtapi.NBTItem import org.bukkit.ChatColor._ import org.bukkit.Sound import org.bukkit.attribute.Attribute -import org.bukkit.entity.{EntityType, Monster, Player} +import org.bukkit.entity.{Creeper, EntityType, Monster, Player} import org.bukkit.event.entity.EntityDamageEvent.DamageCause import org.bukkit.event.entity.{EntityDamageByEntityEvent, EntityExplodeEvent} import org.bukkit.event.player.{PlayerItemConsumeEvent, PlayerJoinEvent} @@ -41,8 +41,8 @@ class ValentineListener[F[_]: ConcurrentEffect: NonServerThreadContextShift]( if (!isInEvent) return event.getEntity match { - case monster: Monster if monster.getType == EntityType.CREEPER => - randomlyDropItemAt(monster, droppedCookie, itemDropRate) + case creeper: Creeper => + randomlyDropItemAt(creeper, droppedCookie, itemDropRate) case _ => } } From 15ccc437a64423de59108c222a2f6755b5ec10c4 Mon Sep 17 00:00:00 2001 From: Lucky3028 Date: Tue, 14 Feb 2023 14:40:48 +0900 Subject: [PATCH 4/5] =?UTF-8?q?docs(valentine):=20=E3=82=B3=E3=83=A1?= =?UTF-8?q?=E3=83=B3=E3=83=88=E3=82=92=E3=82=8F=E3=81=8B=E3=82=8A=E3=82=84?= =?UTF-8?q?=E3=81=99=E3=81=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../subsystems/seasonalevents/valentine/ValentineListener.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/com/github/unchama/seichiassist/subsystems/seasonalevents/valentine/ValentineListener.scala b/src/main/scala/com/github/unchama/seichiassist/subsystems/seasonalevents/valentine/ValentineListener.scala index 90fed3110a..689ed38b76 100644 --- a/src/main/scala/com/github/unchama/seichiassist/subsystems/seasonalevents/valentine/ValentineListener.scala +++ b/src/main/scala/com/github/unchama/seichiassist/subsystems/seasonalevents/valentine/ValentineListener.scala @@ -60,7 +60,7 @@ class ValentineListener[F[_]: ConcurrentEffect: NonServerThreadContextShift]( event.getEntity match { case damaged: Monster if !excludedMonsters.contains(damaged.getType) => val entityMaxHealth = damaged.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue - // damagedが死んだならば + // 巻き込まれたMonsterが死んだならば if (entityMaxHealth <= event.getDamage) { randomlyDropItemAt(damaged, droppedCookie, itemDropRate) } From 8aaf2e5e11e9c500888b3d0022ef400f22f9a16f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 14 Feb 2023 05:48:03 +0000 Subject: [PATCH 5/5] chore(bump): 75 -> 76 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 9e8293f6db..699d81bbf4 100644 --- a/build.sbt +++ b/build.sbt @@ -8,7 +8,7 @@ import java.io._ ThisBuild / scalaVersion := "2.13.4" // ThisBuild / version はGitHub Actionsによって取得/自動更新される。 // 次の行は ThisBuild / version := "(\d*)" の形式でなければならない。 -ThisBuild / version := "75" +ThisBuild / version := "76" ThisBuild / organization := "click.seichi" ThisBuild / description := "ギガンティック☆整地鯖の独自要素を司るプラグイン"