From 1da7a58da126cf0517daddf5de1f796395e9d2df Mon Sep 17 00:00:00 2001
From: k20066 <87357429+k20066@users.noreply.github.com>
Date: Mon, 20 Nov 2023 18:28:37 +0900
Subject: [PATCH] needRescue modify

---
 .../module/complex/CentralizedControlATHumanDetector.java     | 4 ++--
 .../module/complex/CentralizedControlFBAllocator.java         | 4 ++--
 .../module/complex/CentralizedControlFBHumanDetector.java     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/autumn_2023/module/complex/CentralizedControlATHumanDetector.java b/src/main/java/autumn_2023/module/complex/CentralizedControlATHumanDetector.java
index e1321db..bb41475 100755
--- a/src/main/java/autumn_2023/module/complex/CentralizedControlATHumanDetector.java
+++ b/src/main/java/autumn_2023/module/complex/CentralizedControlATHumanDetector.java
@@ -68,7 +68,7 @@ public class CentralizedControlATHumanDetector extends HumanDetector {
       if(!(entity instanceof Civilian)) continue;
       Civilian civ = (Civilian) entity;
 
-      if(!this.isNeedRescueHuman(civ)){
+      if(!this.needRescue(civ)){
         continue;
       }
       StandardMessagePriority level = StandardMessagePriority.NORMAL;
@@ -218,7 +218,7 @@ public class CentralizedControlATHumanDetector extends HumanDetector {
     return true;
   }
 
-  private boolean isNeedRescueHuman(StandardEntity entity){
+  private boolean needRescue(StandardEntity entity){
     if (entity == null)
       return false;
     if (!(entity instanceof Human))
diff --git a/src/main/java/autumn_2023/module/complex/CentralizedControlFBAllocator.java b/src/main/java/autumn_2023/module/complex/CentralizedControlFBAllocator.java
index af4c6c3..5c916ca 100755
--- a/src/main/java/autumn_2023/module/complex/CentralizedControlFBAllocator.java
+++ b/src/main/java/autumn_2023/module/complex/CentralizedControlFBAllocator.java
@@ -187,7 +187,7 @@ public class CentralizedControlFBAllocator extends FireTargetAllocator {
       return(mesciv);
     })
     .map(MessageCivilian::getAgentID)
-    .filter(e -> this.isNeedRescueHuman(this.worldInfo.getEntity(e)))
+    .filter(e -> this.needRescue(this.worldInfo.getEntity(e)))
     .filter(e -> !(finishEntityIDs.contains(e)))
     .collect(Collectors.toSet());
     
@@ -228,7 +228,7 @@ public class CentralizedControlFBAllocator extends FireTargetAllocator {
    * @param entity エンティティ
    * @return true : 救助必要 false : 救助不必要
    */
-  private boolean isNeedRescueHuman(StandardEntity entity){
+  private boolean needRescue(StandardEntity entity){
     if (entity == null)
       return false;
     if (!(entity instanceof Human))
diff --git a/src/main/java/autumn_2023/module/complex/CentralizedControlFBHumanDetector.java b/src/main/java/autumn_2023/module/complex/CentralizedControlFBHumanDetector.java
index 823bb01..ba0cb84 100755
--- a/src/main/java/autumn_2023/module/complex/CentralizedControlFBHumanDetector.java
+++ b/src/main/java/autumn_2023/module/complex/CentralizedControlFBHumanDetector.java
@@ -74,7 +74,7 @@ public class CentralizedControlFBHumanDetector extends HumanDetector {
       if(!(entity instanceof Civilian)) continue;
       Civilian civ = (Civilian) entity;
 
-      if(!this.isNeedRescueHuman(civ)){
+      if(!this.needRescue(civ)){
         continue;
       }
       StandardMessagePriority level = StandardMessagePriority.NORMAL;
@@ -214,7 +214,7 @@ public class CentralizedControlFBHumanDetector extends HumanDetector {
     return true;
   }
 
-  private boolean isNeedRescueHuman(StandardEntity entity){
+  private boolean needRescue(StandardEntity entity){
     if (entity == null)
       return false;
     if (!(entity instanceof Human))
-- 
GitLab