43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
--- a/net/minecraft/server/players/SleepStatus.java
|
|
+++ b/net/minecraft/server/players/SleepStatus.java
|
|
@@ -17,9 +17,12 @@
|
|
}
|
|
|
|
public boolean areEnoughDeepSleeping(int i, List<EntityPlayer> list) {
|
|
- int j = (int) list.stream().filter(EntityHuman::isSleepingLongEnough).count();
|
|
+ // CraftBukkit start
|
|
+ int j = (int) list.stream().filter((eh) -> { return eh.isSleepingLongEnough() || eh.fauxSleeping; }).count();
|
|
+ boolean anyDeepSleep = list.stream().anyMatch(EntityHuman::isSleepingLongEnough);
|
|
|
|
- return j >= this.sleepersNeeded(i);
|
|
+ return anyDeepSleep && j >= this.sleepersNeeded(i);
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
public int sleepersNeeded(int i) {
|
|
@@ -40,16 +43,22 @@
|
|
|
|
this.activePlayers = 0;
|
|
this.sleepingPlayers = 0;
|
|
+ boolean anySleep = false; // CraftBukkit
|
|
|
|
for (EntityPlayer entityplayer : list) {
|
|
if (!entityplayer.isSpectator()) {
|
|
++this.activePlayers;
|
|
- if (entityplayer.isSleeping()) {
|
|
+ if (entityplayer.isSleeping() || entityplayer.fauxSleeping) { // CraftBukkit
|
|
++this.sleepingPlayers;
|
|
}
|
|
+ // CraftBukkit start
|
|
+ if (entityplayer.isSleeping()) {
|
|
+ anySleep = true;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
}
|
|
|
|
- return (j > 0 || this.sleepingPlayers > 0) && (i != this.activePlayers || j != this.sleepingPlayers);
|
|
+ return anySleep && (j > 0 || this.sleepingPlayers > 0) && (i != this.activePlayers || j != this.sleepingPlayers); // CraftBukkit
|
|
}
|
|
}
|