From fba4931834bf1e3cfed50c844c1f84f966a8cf35 Mon Sep 17 00:00:00 2001 From: granny Date: Sun, 12 Jan 2025 18:09:32 -0800 Subject: [PATCH] Adopt MaterialRerouting Adopts the purpur-api to the material rerouting infrastructure introduced by upstream's upstream. --- .../legacy/MaterialRerouting.java.patch | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) rename patches/server/0289-Adopt-MaterialRerouting.patch => purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java.patch (69%) diff --git a/patches/server/0289-Adopt-MaterialRerouting.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java.patch similarity index 69% rename from patches/server/0289-Adopt-MaterialRerouting.patch rename to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java.patch index 49463aba8..74a359244 100644 --- a/patches/server/0289-Adopt-MaterialRerouting.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java.patch @@ -1,20 +1,10 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: granny -Date: Thu, 13 Jun 2024 16:00:30 -0700 -Subject: [PATCH] Adopt MaterialRerouting - -Adopts the purpur-api to the material rerouting infrastructure introduced -by upstream's upstream. - -diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java b/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java -index db8d8e2a07296d62c3097f02b03319e2e1ba9394..e5c30847297e056782084d81fb9300f98d4a8f75 100644 --- a/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java +++ b/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java -@@ -708,4 +708,32 @@ public class MaterialRerouting { +@@ -708,4 +_,32 @@ meta.setCanPlaceOn(materials); } // Paper end -+ // Purpur start ++ // Purpur start - Adopt MaterialRerouting + // Method added post 1.13, no-op (https://github.com/PurpurMC/Purpur/pull/570) + public static void addFuel(Server server, Material material, int burnTime) { + server.addFuel(material, burnTime); @@ -41,5 +31,5 @@ index db8d8e2a07296d62c3097f02b03319e2e1ba9394..e5c30847297e056782084d81fb9300f9 + public static BlockData getBlockData(ItemStack itemStack, Material material) { + return itemStack.getBlockData(MaterialRerouting.transformToBlockType(material)); + } -+ // Purpur end ++ // Purpur end - Adopt MaterialRerouting }