SPIGOT-4888: setSleepingIgnored resets the night even when there is no one in a bed

This commit is contained in:
md_5 2019-05-08 20:34:41 +10:00
parent 15e02b4056
commit ee8818473d

View file

@ -182,15 +182,15 @@
return entityliving != null && entityliving.isAlive() && this.f(entityliving.getChunkCoordinates()); return entityliving != null && entityliving.isAlive() && this.f(entityliving.getChunkCoordinates());
}); });
@@ -421,7 +485,7 @@ @@ -419,7 +483,7 @@
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
if (entityplayer.isSpectator()) { - if (entityplayer.isSpectator()) {
+ if (entityplayer.isSpectator() || (entityplayer.fauxSleeping && !entityplayer.isSleeping())) { // CraftBukkit
++i; ++i;
- } else if (entityplayer.isSleeping()) { } else if (entityplayer.isSleeping()) {
+ } else if (entityplayer.isSleeping() || entityplayer.fauxSleeping) { // CraftBukkit
++j; ++j;
}
}
@@ -437,10 +501,22 @@ @@ -437,10 +501,22 @@
} }