diff options
| -rw-r--r-- | Spigot-API-Patches/0288-Added-PlayerDeepSleepEvent.patch | 58 | ||||
| -rw-r--r-- | Spigot-Server-Patches/0713-Added-PlayerDeepSleepEvent.patch | 22 |
2 files changed, 80 insertions, 0 deletions
diff --git a/Spigot-API-Patches/0288-Added-PlayerDeepSleepEvent.patch b/Spigot-API-Patches/0288-Added-PlayerDeepSleepEvent.patch new file mode 100644 index 0000000000..d8dccca755 --- /dev/null +++ b/Spigot-API-Patches/0288-Added-PlayerDeepSleepEvent.patch @@ -0,0 +1,58 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic <[email protected]> +Date: Wed, 21 Apr 2021 15:58:25 -0700 +Subject: [PATCH] Added PlayerDeepSleepEvent + + +diff --git a/src/main/java/io/papermc/paper/event/player/PlayerDeepSleepEvent.java b/src/main/java/io/papermc/paper/event/player/PlayerDeepSleepEvent.java +new file mode 100644 +index 0000000000000000000000000000000000000000..e3ee540bb0a5bc578b148fbcf8b5e39ab9c8575c +--- /dev/null ++++ b/src/main/java/io/papermc/paper/event/player/PlayerDeepSleepEvent.java +@@ -0,0 +1,46 @@ ++package io.papermc.paper.event.player; ++ ++import org.bukkit.entity.Player; ++import org.bukkit.event.Cancellable; ++import org.bukkit.event.HandlerList; ++import org.bukkit.event.player.PlayerEvent; ++import org.jetbrains.annotations.NotNull; ++ ++/** ++ * Called when a player has slept long enough ++ * to count as passing the night/storm. ++ * <p> ++ * Cancelling this event will prevent the player from being counted as deeply sleeping ++ * unless they exit and re-enter the bed. ++ */ ++public class PlayerDeepSleepEvent extends PlayerEvent implements Cancellable { ++ ++ private static final HandlerList HANDLER_LIST = new HandlerList(); ++ ++ private boolean cancelled; ++ ++ public PlayerDeepSleepEvent(@NotNull Player player) { ++ super(player); ++ } ++ ++ @Override ++ public boolean isCancelled() { ++ return cancelled; ++ } ++ ++ @Override ++ public void setCancelled(boolean cancel) { ++ this.cancelled = cancel; ++ } ++ ++ @NotNull ++ @Override ++ public HandlerList getHandlers() { ++ return HANDLER_LIST; ++ } ++ ++ @NotNull ++ public static HandlerList getHandlerList() { ++ return HANDLER_LIST; ++ } ++} diff --git a/Spigot-Server-Patches/0713-Added-PlayerDeepSleepEvent.patch b/Spigot-Server-Patches/0713-Added-PlayerDeepSleepEvent.patch new file mode 100644 index 0000000000..cf56b0987c --- /dev/null +++ b/Spigot-Server-Patches/0713-Added-PlayerDeepSleepEvent.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic <[email protected]> +Date: Wed, 21 Apr 2021 15:58:19 -0700 +Subject: [PATCH] Added PlayerDeepSleepEvent + + +diff --git a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java +index 3a62bde04d7fbb6c571cfef11d4f6891e11c7ac8..3a13e7a050db7f5c93d810afe56325495cec7aa4 100644 +--- a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java ++++ b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java +@@ -235,6 +235,11 @@ public abstract class EntityHuman extends EntityLiving { + + if (this.isSleeping()) { + ++this.sleepTicks; ++ // Paper start ++ if (this.sleepTicks == 100) { ++ if (!new io.papermc.paper.event.player.PlayerDeepSleepEvent((Player) getBukkitEntity()).callEvent()) { this.sleepTicks = Integer.MIN_VALUE; } ++ } ++ // Paper end + if (this.sleepTicks > 100) { + this.sleepTicks = 100; + } |