sasheg/fabled-hearts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix sleep goal cleanup on bed break: validate bed existence in tick() and canContinueToUse() for non-sleeping state

Browse Source
This commit is contained in:
sasheg
2026-06-14 01:37:22 +03:00
parent dcd402eebf
commit a43adb0de2
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/me/sashegdev/fabled_hearts/ai/EllieSleepGoal.java
+12 -5
View File
@@ -54,6 +54,12 @@ public class EllieSleepGoal extends Goal {
public void tick() { public void tick() {
if (bedPos == null) return; if (bedPos == null) return;
BlockState currentState = ellie.level().getBlockState(bedPos);
if (!(currentState.getBlock() instanceof BedBlock)) {
bedPos = null;
return;
}
tryOpenDoor(); tryOpenDoor();
double distSqr = ellie.distanceToSqr(Vec3.atCenterOf(bedPos)); double distSqr = ellie.distanceToSqr(Vec3.atCenterOf(bedPos));
@@ -104,15 +110,16 @@ public class EllieSleepGoal extends Goal {
@Override @Override
public boolean canContinueToUse() { public boolean canContinueToUse() {
if (bedPos != null) {
BlockState state = ellie.level().getBlockState(bedPos);
if (!state.isBed(ellie.level(), bedPos, null)) return false;
}
if (ellie.isSleeping()) { if (ellie.isSleeping()) {
if (sleepTimer >= MAX_SLEEP_TICKS) return false; if (sleepTimer >= MAX_SLEEP_TICKS) return false;
if (ellie.level().isDay()) return false; if (ellie.level().isDay()) return false;
if (ellie.hurtTime > 10) return false; if (ellie.hurtTime > 10) return false;
if (bedPos != null) { if (ellie.distanceToSqr(Vec3.atCenterOf(bedPos)) > 16.0) return false;
BlockState state = ellie.level().getBlockState(bedPos);
if (!state.isBed(ellie.level(), bedPos, null)) return false;
if (ellie.distanceToSqr(Vec3.atCenterOf(bedPos)) > 16.0) return false;
}
return true; return true;
} }
if (bedPos == null) return false; if (bedPos == null) return false;