1 files changed, 62 insertions, 0 deletions
diff --git a/patches/server/0533-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0533-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
new file mode 100644
index 0000000000..b68431ed82
--- /dev/null
+++ b/patches/server/0533-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
@@ -0,0 +1,62 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Madeline Miller <[email protected]>
+Date: Thu, 31 Dec 2020 12:48:19 +1000
+Subject: [PATCH] Implement API to get Material from Boats and Minecarts
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
+index 5871cd149fe07e97c5d68ffd83dae4d3fc6bcf03..f2896aa6fa5a5282b4be106320c0dad9dd6036c5 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
+@@ -80,6 +80,13 @@ public class CraftBoat extends CraftVehicle implements Boat {
+         this.getHandle().landBoats = workOnLand;
+     }
+ 
++    // Paper start
++    @Override
++    public org.bukkit.Material getBoatMaterial() {
++        return org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(this.getHandle().getDropItem());
++    }
++    // Paper end
++
+     @Override
+     public Status getStatus() {
+         return CraftBoat.boatStatusFromNms(this.getHandle().status);
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java
+index 053112d7411caa6f439bd344e74aff8c844d93ac..067fcc1f44d59dd675a9cc5485234c87366ffe10 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java
+@@ -1,8 +1,10 @@
+ package org.bukkit.craftbukkit.entity;
+ 
+ import net.minecraft.world.entity.vehicle.AbstractMinecart;
++import net.minecraft.world.item.Items; // Paper
+ import net.minecraft.world.level.block.Blocks;
+ import net.minecraft.world.level.block.state.BlockState;
++import org.bukkit.Material; // Paper
+ import org.bukkit.block.data.BlockData;
+ import org.bukkit.craftbukkit.CraftServer;
+ import org.bukkit.craftbukkit.block.data.CraftBlockData;
+@@ -68,6 +70,22 @@ public abstract class CraftMinecart extends CraftVehicle implements Minecart {
+         this.getHandle().setDerailedVelocityMod(derailed);
+     }
+ 
++    // Paper start
++    @Override
++    public Material getMinecartMaterial() {
++         net.minecraft.world.item.Item minecartItem = switch (getHandle().getMinecartType()) {
++            case CHEST -> Items.CHEST_MINECART;
++            case FURNACE ->  Items.FURNACE_MINECART;
++            case TNT ->  Items.TNT_MINECART;
++            case HOPPER ->  Items.HOPPER_MINECART;
++            case COMMAND_BLOCK ->  Items.COMMAND_BLOCK_MINECART;
++            case RIDEABLE, SPAWNER ->  Items.MINECART;
++        };
++
++        return CraftMagicNumbers.getMaterial(minecartItem);
++    }
++    // Paper end
++
+     @Override
+     public AbstractMinecart getHandle() {
+         return (AbstractMinecart) entity;