Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-10 17:42:16 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-6542: Fix counting players with fauxSleeping = true

Browse Source 
By: Ivan R <namelessftw1206@hotmail.com>
This commit is contained in:
CraftBukkit/Spigot 2021-06-15 12:44:34 +10:00
parent e4f5bec8b3
commit c751b9c098
1 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
paper-server/nms-patches/net/minecraft/server/players/SleepStatus.patch
View File

@ -1,20 +1,44 @@
--- a/net/minecraft/server/players/SleepStatus.java --- a/net/minecraft/server/players/SleepStatus.java
+++ b/net/minecraft/server/players/SleepStatus.java +++ b/net/minecraft/server/players/SleepStatus.java
@@ -18,7 +18,7 @@ @@ -18,9 +18,12 @@
} }
public boolean a(int i, List<EntityPlayer> list) { public boolean a(int i, List<EntityPlayer> list) {
- int j = (int) list.stream().filter(EntityHuman::isDeeplySleeping).count(); - int j = (int) list.stream().filter(EntityHuman::isDeeplySleeping).count();
+ int j = (int) list.stream().filter((eh) -> { return eh.isDeeplySleeping() || eh.fauxSleeping; }).count(); // CraftBukkit + // CraftBukkit start
+ int j = (int) list.stream().filter((eh) -> { return eh.isDeeplySleeping() || eh.fauxSleeping; }).count();
+ boolean anyDeepSleep = list.stream().anyMatch(EntityHuman::isDeeplySleeping);
return j >= this.b(i); - return j >= this.b(i);
+ return anyDeepSleep && j >= this.b(i);
+ // CraftBukkit end
} }
@@ -46,7 +46,7 @@
public int b(int i) {
@@ -42,18 +45,24 @@
this.activePlayers = 0;
this.sleepingPlayers = 0;
Iterator iterator = list.iterator();
+ boolean anySleep = false; // CraftBukkit
while (iterator.hasNext()) { while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next(); EntityPlayer entityplayer = (EntityPlayer) iterator.next();
- if (!entityplayer.isSpectator()) { if (!entityplayer.isSpectator()) {
+ if (!entityplayer.isSpectator() && !entityplayer.fauxSleeping) { // CraftBukkit
++this.activePlayers; ++this.activePlayers;
if (entityplayer.isSleeping()) { - if (entityplayer.isSleeping()) {
+ if (entityplayer.isSleeping() || entityplayer.fauxSleeping) { // CraftBukkit
++this.sleepingPlayers; ++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
}
}