diff --git a/src/main/java/autumn_2023/module/complex/CentralizedControlATHumanDetector.java b/src/main/java/autumn_2023/module/complex/CentralizedControlATHumanDetector.java index e1321db9cf8bb2054cac9ea1da4275399870233d..bb414759f92f0f675567ed5d404ac07bb04d45b4 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 af4c6c3641b3fad4f59829e08537c16fed1f511a..5c916ca78ced7498856a01d6c78dbc257b7f5677 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 823bb013f5f98871f5d9e901de9577fecfa2ecef..ba0cb84ed227e642909421ee0964a0636d4908a6 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))