From eb68bd49a24fa6b0296b023b71489afcd4590fda Mon Sep 17 00:00:00 2001 From: SoSeDiK Date: Fri, 14 Oct 2022 11:37:01 +0300 Subject: [PATCH] Allow changing bed's 'occupied' property (#8458) --- ... 0400-Elder-Guardian-appearance-API.patch} | 0 ...low-changing-bed-s-occupied-property.patch | 26 +++++++++++++ ... 0926-Elder-Guardian-appearance-API.patch} | 2 +- ...low-changing-bed-s-occupied-property.patch | 38 +++++++++++++++++++ 4 files changed, 65 insertions(+), 1 deletion(-) rename patches/api/{0399-Elder-Guardian-appearance-API.patch => 0400-Elder-Guardian-appearance-API.patch} (100%) create mode 100644 patches/api/0401-Allow-changing-bed-s-occupied-property.patch rename patches/server/{0925-Elder-Guardian-appearance-API.patch => 0926-Elder-Guardian-appearance-API.patch} (90%) create mode 100644 patches/server/0927-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/api/0399-Elder-Guardian-appearance-API.patch b/patches/api/0400-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/api/0399-Elder-Guardian-appearance-API.patch rename to patches/api/0400-Elder-Guardian-appearance-API.patch diff --git a/patches/api/0401-Allow-changing-bed-s-occupied-property.patch b/patches/api/0401-Allow-changing-bed-s-occupied-property.patch new file mode 100644 index 0000000000..8dfafd6d33 --- /dev/null +++ b/patches/api/0401-Allow-changing-bed-s-occupied-property.patch @@ -0,0 +1,26 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: SoSeDiK +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/block/data/type/Bed.java b/src/main/java/org/bukkit/block/data/type/Bed.java +index ed519bfebe5b921f60867a3900edfce9859058b6..6e7a456dc5e9bfc28a19029a3381e53fa6453d30 100644 +--- a/src/main/java/org/bukkit/block/data/type/Bed.java ++++ b/src/main/java/org/bukkit/block/data/type/Bed.java +@@ -35,6 +35,15 @@ public interface Bed extends Directional { + */ + boolean isOccupied(); + ++ // Paper start ++ /** ++ * Sets the value of the 'occupied' property. ++ * ++ * @param occupied the new 'occupied' value ++ */ ++ void setOccupied(boolean occupied); ++ // Paper end ++ + /** + * Horizontal half of a bed. + */ diff --git a/patches/server/0925-Elder-Guardian-appearance-API.patch b/patches/server/0926-Elder-Guardian-appearance-API.patch similarity index 90% rename from patches/server/0925-Elder-Guardian-appearance-API.patch rename to patches/server/0926-Elder-Guardian-appearance-API.patch index 110abf2d96..415f2653b4 100644 --- a/patches/server/0925-Elder-Guardian-appearance-API.patch +++ b/patches/server/0926-Elder-Guardian-appearance-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Elder Guardian appearance API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 968aa80b57a31d89852c6f4bc0ec5ed4a98c6530..4712a034ea43a6dada15d68e8657c48519b3eac0 100644 +index 968aa80b57a31d89852c6f4bc0ec5ed4a98c6530..b1136b9c39b16cbb9dfe460f88000f74ccd4f571 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2932,6 +2932,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0927-Allow-changing-bed-s-occupied-property.patch b/patches/server/0927-Allow-changing-bed-s-occupied-property.patch new file mode 100644 index 0000000000..4d0128b6d3 --- /dev/null +++ b/patches/server/0927-Allow-changing-bed-s-occupied-property.patch @@ -0,0 +1,38 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: SoSeDiK +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 getFaces() { + return getValues(CraftBed.FACING, org.bukkit.block.BlockFace.class); + } ++ ++ // Paper start ++ @Override ++ public void setOccupied(boolean occupied) { ++ set(CraftBed.OCCUPIED, occupied); ++ } ++ // Paper end + }