aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJake Potrebic <[email protected]>2021-04-24 04:38:08 -0700
committerGitHub <[email protected]>2021-04-24 11:38:08 +0000
commit4047cffca8780231b7a38f285480e3f2875863f3 (patch)
treeebf2a42308a0ec7b52bc695b16fd6e1a25049cd7
parent70d697e6e30cddf1b18eee09fd91f5de0fcee24b (diff)
downloadPaper-4047cffca8780231b7a38f285480e3f2875863f3.tar.gz
Paper-4047cffca8780231b7a38f285480e3f2875863f3.zip
Add PlayerBedFailEnterEvent (#4935)
-rw-r--r--Spigot-API-Patches/0290-Added-PlayerBedFailEnterEvent.patch131
-rw-r--r--Spigot-Server-Patches/0715-Added-PlayerBedFailEnterEvent.patch56
2 files changed, 187 insertions, 0 deletions
diff --git a/Spigot-API-Patches/0290-Added-PlayerBedFailEnterEvent.patch b/Spigot-API-Patches/0290-Added-PlayerBedFailEnterEvent.patch
new file mode 100644
index 0000000000..dde6c8f9de
--- /dev/null
+++ b/Spigot-API-Patches/0290-Added-PlayerBedFailEnterEvent.patch
@@ -0,0 +1,131 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Thu, 24 Dec 2020 12:27:49 -0800
+Subject: [PATCH] Added PlayerBedFailEnterEvent
+
+
+diff --git a/src/main/java/io/papermc/paper/event/player/PlayerBedFailEnterEvent.java b/src/main/java/io/papermc/paper/event/player/PlayerBedFailEnterEvent.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..b7a8c8f0a5ba1b4d8e3d7a6f9381cb9a81315336
+--- /dev/null
++++ b/src/main/java/io/papermc/paper/event/player/PlayerBedFailEnterEvent.java
+@@ -0,0 +1,119 @@
++package io.papermc.paper.event.player;
++
++import net.kyori.adventure.text.Component;
++import org.bukkit.block.Block;
++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;
++import org.jetbrains.annotations.Nullable;
++
++public class PlayerBedFailEnterEvent extends PlayerEvent implements Cancellable {
++
++ private static final HandlerList HANDLER_LIST = new HandlerList();
++
++ private final FailReason failReason;
++ private final Block bed;
++ private boolean willExplode;
++ private Component message;
++ private boolean cancelled;
++
++ public PlayerBedFailEnterEvent(@NotNull Player player, @NotNull FailReason failReason, @NotNull Block bed, boolean willExplode, @Nullable Component message) {
++ super(player);
++ this.failReason = failReason;
++ this.bed = bed;
++ this.willExplode = willExplode;
++ this.message = message;
++ }
++
++ @NotNull
++ public FailReason getFailReason() {
++ return failReason;
++ }
++
++ @NotNull
++ public Block getBed() {
++ return bed;
++ }
++
++ public boolean getWillExplode() {
++ return willExplode;
++ }
++
++ public void setWillExplode(boolean willExplode) {
++ this.willExplode = willExplode;
++ }
++
++ @Nullable
++ public Component getMessage() {
++ return message;
++ }
++
++ public void setMessage(@Nullable Component message) {
++ this.message = message;
++ }
++
++ @Override
++ public boolean isCancelled() {
++ return cancelled;
++ }
++
++ /**
++ * Cancel this event.
++ * <p>
++ * <b>NOTE: This does not cancel the player getting in the bed, but any messages/explosions
++ * that may occur because of the interaction.</b>
++ * @param cancel true if you wish to cancel this event
++ */
++ @Override
++ public void setCancelled(boolean cancel) {
++ cancelled = cancel;
++ }
++
++ @NotNull
++ @Override
++ public HandlerList getHandlers() {
++ return HANDLER_LIST;
++ }
++
++ @NotNull
++ public static HandlerList getHandlerList() {
++ return HANDLER_LIST;
++ }
++
++ public static enum FailReason {
++ /**
++ * The world doesn't allow sleeping (ex. Nether or The End). Entering
++ * the bed is prevented and the bed explodes.
++ */
++ NOT_POSSIBLE_HERE,
++ /**
++ * Entering the bed is prevented due to it not being night nor
++ * thundering currently.
++ * <p>
++ * If the event is forcefully allowed during daytime, the player will
++ * enter the bed (and set its bed location), but might get immediately
++ * thrown out again.
++ */
++ NOT_POSSIBLE_NOW,
++ /**
++ * Entering the bed is prevented due to the player being too far away.
++ */
++ TOO_FAR_AWAY,
++ /**
++ * Bed is obstructed.
++ */
++ OBSTRUCTED,
++ /**
++ * Entering the bed is prevented due to there being some other problem.
++ */
++ OTHER_PROBLEM,
++ /**
++ * Entering the bed is prevented due to there being monsters nearby.
++ */
++ NOT_SAFE;
++
++ public static final FailReason[] VALUES = values();
++ }
++}
diff --git a/Spigot-Server-Patches/0715-Added-PlayerBedFailEnterEvent.patch b/Spigot-Server-Patches/0715-Added-PlayerBedFailEnterEvent.patch
new file mode 100644
index 0000000000..f74fd8eb88
--- /dev/null
+++ b/Spigot-Server-Patches/0715-Added-PlayerBedFailEnterEvent.patch
@@ -0,0 +1,56 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Thu, 24 Dec 2020 12:27:41 -0800
+Subject: [PATCH] Added PlayerBedFailEnterEvent
+
+
+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 3a13e7a050db7f5c93d810afe56325495cec7aa4..c39c50e53549e9cb9d3520bc7e8b7e89cfa20163 100644
+--- a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
++++ b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
+@@ -2233,6 +2233,7 @@ public abstract class EntityHuman extends EntityLiving {
+ this.g = ichatbasecomponent;
+ }
+
++ public @Nullable IChatBaseComponent getChatComponent() { return this.a(); }; // Paper - OBFHELPER
+ @Nullable
+ public IChatBaseComponent a() {
+ return this.g;
+diff --git a/src/main/java/net/minecraft/world/level/block/BlockBed.java b/src/main/java/net/minecraft/world/level/block/BlockBed.java
+index eca84595342756e3550883551e487aaf79574fde..abe0a1c309d526de37efcac44922fa259e1d112c 100644
+--- a/src/main/java/net/minecraft/world/level/block/BlockBed.java
++++ b/src/main/java/net/minecraft/world/level/block/BlockBed.java
+@@ -43,6 +43,8 @@ import net.minecraft.world.phys.shapes.VoxelShape;
+ import net.minecraft.world.phys.shapes.VoxelShapeCollision;
+ import net.minecraft.world.phys.shapes.VoxelShapes;
+ import org.apache.commons.lang3.ArrayUtils;
++import io.papermc.paper.event.player.PlayerBedFailEnterEvent; // Paper
++import io.papermc.paper.adventure.PaperAdventure; // Paper
+
+ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
+
+@@ -101,14 +103,22 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
+ BlockPosition finalblockposition = blockposition;
+ // CraftBukkit end
+ entityhuman.sleep(blockposition).ifLeft((entityhuman_enumbedresult) -> {
++ // Paper start - PlayerBedFailEnterEvent
++ if (entityhuman_enumbedresult != null) {
++ PlayerBedFailEnterEvent event = new PlayerBedFailEnterEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), PlayerBedFailEnterEvent.FailReason.VALUES[entityhuman_enumbedresult.ordinal()], org.bukkit.craftbukkit.block.CraftBlock.at(world, finalblockposition), entityhuman_enumbedresult == EntityHuman.EnumBedResult.NOT_POSSIBLE_HERE, PaperAdventure.asAdventure(entityhuman_enumbedresult.getChatComponent()));
++ if (!event.callEvent()) {
++ return;
++ }
++ // Paper end
+ // CraftBukkit start - handling bed explosion from below here
+- if (entityhuman_enumbedresult == EntityHuman.EnumBedResult.NOT_POSSIBLE_HERE) {
++ if (event.getWillExplode()) { // Paper
+ this.explodeBed(finaliblockdata, world, finalblockposition);
+ } else
+ // CraftBukkit end
+ if (entityhuman_enumbedresult != null) {
+- entityhuman.a(entityhuman_enumbedresult.a(), true);
++ entityhuman.a(PaperAdventure.asVanilla(event.getMessage()), true); // Paper
+ }
++ } // Paper
+
+ });
+ return EnumInteractionResult.SUCCESS;