Undeprecate and fix Boat#getBoatMaterial (#8217)

2022-08-01 23:02:23 +10:00
parent f0d198d6b2
commit 20a8246572
2 changed files with 1 additions and 3 deletions
--- a/patches/api/Add-API-to-get-Material-from-Boats-and-Minecarts.patch
+++ b/patches/api/Add-API-to-get-Material-from-Boats-and-Minecarts.patch
@ -18,9 +18,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * Gets the {@link Material} that represents this Boat type.
 +     *
 +     * @return the boat material.
-+     * @deprecated use {@link #getBoatType()} and {@link Type#getMaterial()}
 +     */
-+    @Deprecated
 +    @NotNull
 +    public Material getBoatMaterial();
 +    // Paper end
--- a/patches/server/Implement-API-to-get-Material-from-Boats-and-Minecar.patch
+++ b/patches/server/Implement-API-to-get-Material-from-Boats-and-Minecar.patch
@ -15,7 +15,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    // Paper start
 +    @Override
 +    public org.bukkit.Material getBoatMaterial() {
-+        return this.getBoatType().getMaterial();
+        return org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(this.getHandle().getDropItem());
 +    }
 +    // Paper end
 +