mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated Upstream (Bukkit/CraftBukkit) (#6513)

Browse source 
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:
ea7b3a0d #654: Clarify conditions where a bed can explode

CraftBukkit Changes:
e167f280 SPIGOT-6726: NPE when calling getBossBar() on plugin spawned EnderDragon
This commit is contained in:
Nassim Jahnke 2021-08-28 14:45:14 +02:00 committed by GitHub
parent 411a5eed18
commit 2d78bb5776
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
patches/api/0246-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
View file

@ -5,10 +5,10 @@ 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 diff --git a/src/main/java/org/bukkit/event/player/PlayerBedEnterEvent.java b/src/main/java/org/bukkit/event/player/PlayerBedEnterEvent.java
index c7d57e286c11eaa578ff6fd457b02a9ff829aa71..24b371b11347abf31fda4dadde8e0a7af60b181b 100644 index fd6b83f1f9bb2e25613e3f88e497b9d57d393937..ced77de350fa53889439e945336343a1cca5b9ba 100644
--- a/src/main/java/org/bukkit/event/player/PlayerBedEnterEvent.java --- a/src/main/java/org/bukkit/event/player/PlayerBedEnterEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerBedEnterEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerBedEnterEvent.java
@@ -37,6 +37,12 @@ public class PlayerBedEnterEvent extends PlayerEvent implements Cancellable { @@ -42,6 +42,12 @@ public class PlayerBedEnterEvent extends PlayerEvent implements Cancellable {
* Entering the bed is prevented due to the player being too far away. * Entering the bed is prevented due to the player being too far away.
*/ */
TOO_FAR_AWAY, TOO_FAR_AWAY,

2
work/Bukkit

@ -1 +1 @@
Subproject commit ca5b4b1ae6c3d22ce76f57bec97d298c8914c466 Subproject commit ea7b3a0d809057eb8edfbb2b8f048077468e8ac6

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 5be41fb80fa84c15359d271c38b52a1e815ea9f9 Subproject commit e167f28088ed0d6004d9c2775a98260d765edda2