Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 04:20:04 +01:00
b5ce6e3dc5
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: eb4b416d PR-822: Add experimental armor trim API 33498e1d PR-831: Add a standard of annotations for Minecraft experimental things and API CraftBukkit Changes: 19de3550d SPIGOT-7315: Bed placement duplicates crops if cancelled 1eb88374e PR-1147: Add experimental armor trim API c4c0bb0e9 Show clean error for invalidly configured server.properties options 3ae90697f Fix UUID not being updated when changing world of MapView e43000601 PR-1164, MC-227255, MC-253819: Fix rotation of beehives and bells Spigot Changes: d2fdfe39 Rebuild patches
52 Zeilen
1.7 KiB
Diff
52 Zeilen
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 08e54aac52322aac2d033083ab4f589160386627..8715e53e6b85ebaf3d07297c838432b9e6f28c2a 100644
|
|
--- a/src/main/java/org/bukkit/entity/Boat.java
|
|
+++ b/src/main/java/org/bukkit/entity/Boat.java
|
|
@@ -181,4 +181,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
|
|
}
|