Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-17 03:50:08 +01:00
275173e538
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: 0c5d8709 SPIGOT-7400: Downgrade maven-resolver due to issues resolving certain depends 255c4fdb SPIGOT-7380: Add PlayerInteractEvent#getClickedPosition and ChiseledBookshelf#getSlot CraftBukkit Changes: b6b514b7e SPIGOT-7400: Downgrade maven-resolver due to issues resolving certain depends fcff84de9 SPIGOT-7399: Revert null check in CraftMetaItem#safelyAdd 44a4b5649 SPIGOT-7380: Add PlayerInteractEvent#getClickedPosition and ChiseledBookshelf#getSlot 676969d01 SPIGOT-7389: Handle setting null items in ChiseledBookshelf Inventory
39 Zeilen
1.7 KiB
Diff
39 Zeilen
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: SoSeDiK <mrsosedik@gmail.com>
|
|
Date: Wed, 12 Oct 2022 00:36:55 +0300
|
|
Subject: [PATCH] Allow changing bed's 'occupied' property
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/type/CraftBed.java b/src/main/java/org/bukkit/craftbukkit/block/data/type/CraftBed.java
|
|
index c892c0e37bd4f9b208147e2df16fc9ed024eacf7..71df14b932306aa4c8ea6d4883f6ba053955ec28 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/data/type/CraftBed.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/data/type/CraftBed.java
|
|
@@ -22,4 +22,11 @@ public abstract class CraftBed extends CraftBlockData implements Bed {
|
|
public boolean isOccupied() {
|
|
return get(CraftBed.OCCUPIED);
|
|
}
|
|
+
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public void setOccupied(boolean occupied) {
|
|
+ set(CraftBed.OCCUPIED, occupied);
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftBed.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftBed.java
|
|
index 66a183fa0af6978dd220a3dde27255ad45e47137..108fbb8ab9142a6f779651f3562a81c6cfaa3c30 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftBed.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftBed.java
|
|
@@ -51,4 +51,11 @@ public final class CraftBed extends org.bukkit.craftbukkit.block.data.CraftBlock
|
|
public java.util.Set<org.bukkit.block.BlockFace> getFaces() {
|
|
return getValues(CraftBed.FACING, org.bukkit.block.BlockFace.class);
|
|
}
|
|
+
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public void setOccupied(boolean occupied) {
|
|
+ set(CraftBed.OCCUPIED, occupied);
|
|
+ }
|
|
+ // Paper end
|
|
}
|