Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 08:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adopt MaterialRerouting

Browse Source 
Adopts the purpur-api to the material rerouting infrastructure introduced by upstream's upstream.
This commit is contained in:
granny
2025-01-12 18:09:32 -08:00
committed by granny
parent 099d39670f
commit fba4931834
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0289-Adopt-MaterialRerouting.patch → purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java.patch
View File

@@ -1,20 +1,10 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
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 --- a/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java
+++ b/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); meta.setCanPlaceOn(materials);
} }
// Paper end // Paper end
+ // Purpur start + // Purpur start - Adopt MaterialRerouting
+ // Method added post 1.13, no-op (https://github.com/PurpurMC/Purpur/pull/570) + // Method added post 1.13, no-op (https://github.com/PurpurMC/Purpur/pull/570)
+ public static void addFuel(Server server, Material material, int burnTime) { + public static void addFuel(Server server, Material material, int burnTime) {
+ server.addFuel(material, burnTime); + server.addFuel(material, burnTime);
@@ -41,5 +31,5 @@ index db8d8e2a07296d62c3097f02b03319e2e1ba9394..e5c30847297e056782084d81fb9300f9
+ public static BlockData getBlockData(ItemStack itemStack, Material material) { + public static BlockData getBlockData(ItemStack itemStack, Material material) {
+ return itemStack.getBlockData(MaterialRerouting.transformToBlockType(material)); + return itemStack.getBlockData(MaterialRerouting.transformToBlockType(material));
+ } + }
+ // Purpur end + // Purpur end - Adopt MaterialRerouting
} }