mirror of
https://github.com/PaperMC/Paper.git
synced 2024-06-30 16:54:55 +02:00
928bcc8d3a
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
52 lines
1.7 KiB
Diff
52 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Madeline Miller <mnmiller1@me.com>
|
|
Date: Thu, 31 Dec 2020 12:48:38 +1000
|
|
Subject: [PATCH] Add API to get Material from Boats and Minecarts
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Boat.java b/src/main/java/org/bukkit/entity/Boat.java
|
|
index e5d5d2c944df1e9a81b38d3854fbe70c166588d1..3e458b96d5c15a78d3d411d5b88a716213588a94 100644
|
|
--- a/src/main/java/org/bukkit/entity/Boat.java
|
|
+++ b/src/main/java/org/bukkit/entity/Boat.java
|
|
@@ -173,4 +173,14 @@ public interface Boat extends Vehicle {
|
|
ON_LAND,
|
|
IN_AIR;
|
|
}
|
|
+
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the {@link Material} that represents this Boat type.
|
|
+ *
|
|
+ * @return the boat material.
|
|
+ */
|
|
+ @NotNull
|
|
+ public Material getBoatMaterial();
|
|
+ // Paper end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/entity/Minecart.java b/src/main/java/org/bukkit/entity/Minecart.java
|
|
index 7f9c4d4b430a3f0276461346ff2621bacf864075..bc1e62759c995a1463ebcd10d73c7d502c9acc45 100644
|
|
--- a/src/main/java/org/bukkit/entity/Minecart.java
|
|
+++ b/src/main/java/org/bukkit/entity/Minecart.java
|
|
@@ -1,5 +1,6 @@
|
|
package org.bukkit.entity;
|
|
|
|
+import org.bukkit.Material;
|
|
import org.bukkit.block.data.BlockData;
|
|
import org.bukkit.material.MaterialData;
|
|
import org.bukkit.util.Vector;
|
|
@@ -147,4 +148,14 @@ public interface Minecart extends Vehicle {
|
|
* @return the current block offset for this minecart.
|
|
*/
|
|
public int getDisplayBlockOffset();
|
|
+
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the {@link Material} that represents this Minecart type.
|
|
+ *
|
|
+ * @return the minecart material.
|
|
+ */
|
|
+ @NotNull
|
|
+ public Material getMinecartMaterial();
|
|
+ // Paper end
|
|
}
|