mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-26 12:36:07 +01:00
928bcc8d3a
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
24 lines
1.0 KiB
Diff
24 lines
1.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Thu, 24 Dec 2020 12:43:30 -0800
|
|
Subject: [PATCH] Add OBSTRUCTED reason to BedEnterResult
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/player/PlayerBedEnterEvent.java b/src/main/java/org/bukkit/event/player/PlayerBedEnterEvent.java
|
|
index fd6b83f1f9bb2e25613e3f88e497b9d57d393937..ced77de350fa53889439e945336343a1cca5b9ba 100644
|
|
--- a/src/main/java/org/bukkit/event/player/PlayerBedEnterEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/player/PlayerBedEnterEvent.java
|
|
@@ -42,6 +42,12 @@ public class PlayerBedEnterEvent extends PlayerEvent implements Cancellable {
|
|
* Entering the bed is prevented due to the player being too far away.
|
|
*/
|
|
TOO_FAR_AWAY,
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Bed was obstructed.
|
|
+ */
|
|
+ OBSTRUCTED,
|
|
+ // Paper end
|
|
/**
|
|
* Entering the bed is prevented due to there being monsters nearby.
|
|
*/
|