Change: Peaceful mode conditions.

Author: nafu-at

build.gradle

@@ -7,7 +7,7 @@ plugins {
 }
 
 group = 'page.nafuchoco'
-version = '5.0.0-SNAPSHOT-1'
+version = '5.0.0-SNAPSHOT-2'
 
 java {
     toolchain {

src/main/java/page/nafuchoco/soloservercore/listener/PeacefulModeEventListener.java

@@ -34,9 +34,10 @@ public void onEntityTargetEvent(EntityTargetEvent event) {
         if (event.getTarget() instanceof Player player && event.getEntity() instanceof Monster) {
             val sscPlayer = SoloServerApi.getInstance().getSSCPlayer(player);
             if (sscPlayer.isPeacefulMode()) {
-                if (event.getReason() == EntityTargetEvent.TargetReason.CLOSEST_PLAYER
+                if (event.getEntity() instanceof Monster
+                        && (event.getReason() == EntityTargetEvent.TargetReason.CLOSEST_PLAYER
                         || event.getReason() == EntityTargetEvent.TargetReason.TARGET_ATTACKED_ENTITY
-                        || event.getReason() == EntityTargetEvent.TargetReason.TARGET_ATTACKED_NEARBY_ENTITY)
+                        || event.getReason() == EntityTargetEvent.TargetReason.TARGET_ATTACKED_NEARBY_ENTITY))
                     event.setCancelled(true);
             }
         }
@@ -57,16 +58,22 @@ public void onEntityDamageEvent(EntityDamageEvent event) {
 
     @EventHandler
     public void onEntityDamageByEntityEvent(EntityDamageByEntityEvent event) {
+        boolean cancelled = event.isCancelled(); // 今後追加の可能性
+        // プレイヤーに対する攻撃に関する処理
         if (event.getEntity() instanceof Player player) {
             val sscPlayer = SoloServerApi.getInstance().getSSCPlayer(player);
             if (sscPlayer.isPeacefulMode()) {
-                boolean cancelled = event.isCancelled(); // 今後追加の可能性
                 if (event.getDamager() instanceof TNTPrimed) // TNT爆破の無効化
                     cancelled = true;
-
-                event.setCancelled(cancelled);
             }
+        } else if (event.getDamager() instanceof Player player
+                && event.getEntity() instanceof Monster) { // プレイヤーによる攻撃に関する処理
+            val sscPlayer = SoloServerApi.getInstance().getSSCPlayer(player);
+            if (sscPlayer.isPeacefulMode() && !player.hasPermission("soloservercore.peaceful.bypass"))
+                cancelled = true;
         }
+
+        event.setCancelled(cancelled);
     }
 
     @EventHandler

src/main/resources/plugin.yml

@@ -52,6 +52,7 @@ permissions:
       soloservercore.spawn: true
       soloservercore.home: true
       soloservercore.peaceful: true
+      soloservercore.peaceful.bypass: true
       soloservercore.team.create: true
       soloservercore.team.invite: true
       soloservercore.team.accept: true