Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 04:20:04 +01:00
ef0e5a642d
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: 9ae3f10f SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API 48c0c547 PR-786: Add methods to get sounds from entities CraftBukkit Changes: 5cc9c022a SPIGOT-7152: Handle hand item changing during air interact event 4ffa1acf6 SPIGOT-7154: Players get kicked when interacting with a conversation 4daa21123 SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API e5d6a9bbf PR-1100: Add methods to get sounds from entities b7e9f1c8b SPIGOT-7146: Reduce use of Material switch in ItemMeta Spigot Changes: 4c157bb4 Rebuild patches
22 Zeilen
1.1 KiB
Diff
22 Zeilen
1.1 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: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 c2eefe215f47e36cc2b8476750ae00ec88f826a6..7f8dbc94ad04ff58e0ee7591b42e268ee4b75576 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
@@ -263,6 +263,10 @@ 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;
|
|
}
|