Fix #70

This fixes the thunderstorm looping bug by forcing players out of bed immediately and only removing the world from the skipping queue after 20 ticks.
nkomarn · Nov 10, 2020 · ce28be8 · ce28be8
1 parent 130953b
commit ce28be8
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/main/java/xyz/nkomarn/harbor/task/AccelerateNightTask.java b/src/main/java/xyz/nkomarn/harbor/task/AccelerateNightTask.java
@@ -3,6 +3,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.Statistic;
 import org.bukkit.World;
+import org.bukkit.entity.LivingEntity;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.jetbrains.annotations.NotNull;
 import xyz.nkomarn.harbor.Harbor;
@@ -53,9 +54,15 @@ public void run() {
                 world.getPlayers().forEach(player -> player.setStatistic(Statistic.TIME_SINCE_REST, 0));
             }
 
-            checker.resetStatus(world);
-            harbor.getPlayerManager().clearCooldowns();
-            harbor.getMessages().sendRandomChatMessage(world, "messages.chat.night-skipped");
+            world.getPlayers().stream()
+                    .filter(LivingEntity::isSleeping)
+                    .forEach(player -> player.wakeup(true));
+
+            harbor.getServer().getScheduler().runTaskLater(harbor, () -> {
+                checker.resetStatus(world);
+                harbor.getPlayerManager().clearCooldowns();
+                harbor.getMessages().sendRandomChatMessage(world, "messages.chat.night-skipped");
+            }, 20L);
             cancel();
             return;
         }