修正部分问题

TartaricAcid · Jan 8, 2024 · 702fa18 · 702fa18
1 parent 16b16ce
commit 702fa18
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 40 deletions.
diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/ai/brain/task/MaidBedTask.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/ai/brain/task/MaidBedTask.java
@@ -35,7 +35,7 @@ public MaidBedTask(float movementSpeed, int closeEnoughDist) {
 
     @Override
     protected boolean checkExtraStartConditions(ServerLevel worldIn, EntityMaid maid) {
-        if (super.checkExtraStartConditions(worldIn, maid) && maid.getVehicle() == null && !maid.isInSittingPose()) {
+        if (super.checkExtraStartConditions(worldIn, maid) && this.maidStateConditions(maid)) {
             BlockPos bedPos = findBed(worldIn, maid);
             if (bedPos != null && maid.isWithinRestriction(bedPos)) {
                 if (bedPos.distToCenterSqr(maid.position()) < this.closeEnoughDist) {
@@ -74,4 +74,8 @@ private BlockPos findBed(ServerLevel world, EntityMaid maid) {
         return poiManager.getInRange(type -> type.get().equals(InitPoi.MAID_BED.get()), blockPos, range, PoiManager.Occupancy.ANY)
                 .map(PoiRecord::getPos).min(Comparator.comparingDouble(pos -> pos.distSqr(blockPos))).orElse(null);
     }
+
+    private boolean maidStateConditions(EntityMaid maid) {
+        return !maid.isInSittingPose() && !maid.isSleeping() && !maid.isLeashed() && !maid.isPassenger();
+    }
 }
diff --git a/...a/com/github/tartaricacid/touhoulittlemaid/entity/ai/brain/task/MaidCollectHoneyTask.java b/...a/com/github/tartaricacid/touhoulittlemaid/entity/ai/brain/task/MaidCollectHoneyTask.java
@@ -45,7 +45,7 @@ public MaidCollectHoneyTask(float speed, int closeEnoughDist) {
 
     @Override
     protected boolean checkExtraStartConditions(ServerLevel worldIn, EntityMaid maid) {
-        if (super.checkExtraStartConditions(worldIn, maid)) {
+        if (super.checkExtraStartConditions(worldIn, maid) && this.maidStateConditions(maid)) {
             BlockPos beehivePos = findBeehive(worldIn, maid);
             if (beehivePos != null && maid.isWithinRestriction(beehivePos)) {
                 if (beehivePos.distToCenterSqr(maid.position()) < this.closeEnoughDist) {
@@ -135,4 +135,8 @@ private boolean canCollectHoney(ServerLevel world, BlockPos hivePos) {
     public void resetHoneyLevel(Level level, BlockState state, BlockPos pos) {
         level.setBlock(pos, state.setValue(BeehiveBlock.HONEY_LEVEL, 0), Block.UPDATE_ALL);
     }
+
+    private boolean maidStateConditions(EntityMaid maid) {
+        return !maid.isInSittingPose() && !maid.isSleeping() && !maid.isLeashed() && !maid.isPassenger();
+    }
 }
diff --git a/...ava/com/github/tartaricacid/touhoulittlemaid/entity/ai/brain/task/MaidFindGomokuTask.java b/...ava/com/github/tartaricacid/touhoulittlemaid/entity/ai/brain/task/MaidFindGomokuTask.java
diff --git a/...in/java/com/github/tartaricacid/touhoulittlemaid/entity/ai/brain/task/MaidGomokuTask.java b/...in/java/com/github/tartaricacid/touhoulittlemaid/entity/ai/brain/task/MaidGomokuTask.java
@@ -34,7 +34,7 @@ public MaidGomokuTask(float movementSpeed, int closeEnoughDist) {
 
     @Override
     protected boolean checkExtraStartConditions(ServerLevel worldIn, EntityMaid maid) {
-        if (super.checkExtraStartConditions(worldIn, maid) && maid.getVehicle() == null && !maid.isInSittingPose()) {
+        if (super.checkExtraStartConditions(worldIn, maid) && this.maidStateConditions(maid)) {
             BlockPos gomokuPos = findGomoku(worldIn, maid);
             if (gomokuPos != null && maid.isWithinRestriction(gomokuPos)) {
                 if (gomokuPos.distToCenterSqr(maid.position()) < this.closeEnoughDist) {
@@ -81,4 +81,8 @@ private boolean isOccupied(ServerLevel worldIn, BlockPos pos) {
         }
         return true;
     }
+
+    private boolean maidStateConditions(EntityMaid maid) {
+        return !maid.isInSittingPose() && !maid.isSleeping() && !maid.isLeashed() && !maid.isPassenger();
+    }
 }
diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/ai/brain/task/MaidJoyTask.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/ai/brain/task/MaidJoyTask.java
@@ -34,7 +34,7 @@ public MaidJoyTask(float movementSpeed, int closeEnoughDist) {
 
     @Override
     protected boolean checkExtraStartConditions(ServerLevel worldIn, EntityMaid maid) {
-        if (super.checkExtraStartConditions(worldIn, maid) && maid.getVehicle() == null && !maid.isInSittingPose()) {
+        if (super.checkExtraStartConditions(worldIn, maid) && this.maidStateConditions(maid)) {
             BlockPos joyPos = findJoy(worldIn, maid);
             if (joyPos != null && maid.isWithinRestriction(joyPos)) {
                 if (joyPos.distToCenterSqr(maid.position()) < this.closeEnoughDist) {
@@ -81,4 +81,8 @@ private boolean isOccupied(ServerLevel worldIn, BlockPos pos) {
         }
         return true;
     }
+
+    private boolean maidStateConditions(EntityMaid maid) {
+        return !maid.isInSittingPose() && !maid.isSleeping() && !maid.isLeashed() && !maid.isPassenger();
+    }
 }