mirror of
https://github.com/PaperMC/Paper.git
synced 2025-02-22 04:33:28 +01:00
Add OBSTRUCTED result to BedEnterResult enum
This commit is contained in:
parent
0c40a013dd
commit
93a75a9588
2 changed files with 44 additions and 0 deletions
Spigot-API-Patches
Spigot-Server-Patches
|
@ -0,0 +1,23 @@
|
||||||
|
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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/src/main/java/org/bukkit/event/player/PlayerBedEnterEvent.java
|
||||||
|
+++ b/src/main/java/org/bukkit/event/player/PlayerBedEnterEvent.java
|
||||||
|
@@ -0,0 +0,0 @@ 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.
|
||||||
|
*/
|
|
@ -0,0 +1,21 @@
|
||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||||||
|
Date: Thu, 24 Dec 2020 12:43:39 -0800
|
||||||
|
Subject: [PATCH] Add OBSTRUCTED reason to BedEnterResult
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||||
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||||
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||||
|
@@ -0,0 +0,0 @@ public class CraftEventFactory {
|
||||||
|
return BedEnterResult.TOO_FAR_AWAY;
|
||||||
|
case NOT_SAFE:
|
||||||
|
return BedEnterResult.NOT_SAFE;
|
||||||
|
+ // Paper start
|
||||||
|
+ case OBSTRUCTED:
|
||||||
|
+ return BedEnterResult.OBSTRUCTED;
|
||||||
|
+ // Paper end
|
||||||
|
default:
|
||||||
|
return BedEnterResult.OTHER_PROBLEM;
|
||||||
|
}
|
Loading…
Add table
Reference in a new issue