mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-22 08:57:35 +01:00
71c84c8132
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: 9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent 258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD CraftBukkit Changes: 98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent 5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class 76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor Spigot Changes: e9ec5485 Rebuild patches f1b62e0c Rebuild patches
78 lines
2.6 KiB
Diff
78 lines
2.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
|
|
Date: Sun, 26 Dec 2021 14:03:11 -0500
|
|
Subject: [PATCH] Bucketable API
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/entity/Bucketable.java b/src/main/java/io/papermc/paper/entity/Bucketable.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..84e360a16de956834a91142d45e4b5a0fe3d3a92
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/entity/Bucketable.java
|
|
@@ -0,0 +1,42 @@
|
|
+package io.papermc.paper.entity;
|
|
+
|
|
+import org.bukkit.Sound;
|
|
+import org.bukkit.entity.Entity;
|
|
+import org.bukkit.inventory.ItemStack;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+/**
|
|
+ * Represents an entity that can be bucketed.
|
|
+ */
|
|
+public interface Bucketable extends Entity {
|
|
+
|
|
+ /**
|
|
+ * Gets if this entity originated from a bucket.
|
|
+ *
|
|
+ * @return originated from bucket
|
|
+ */
|
|
+ boolean isFromBucket();
|
|
+
|
|
+ /**
|
|
+ * Sets if this entity originated from a bucket.
|
|
+ *
|
|
+ * @param fromBucket is from a bucket
|
|
+ */
|
|
+ void setFromBucket(boolean fromBucket);
|
|
+
|
|
+ /**
|
|
+ * Gets the base itemstack of this entity in a bucket form.
|
|
+ *
|
|
+ * @return bucket form
|
|
+ */
|
|
+ @NotNull
|
|
+ ItemStack getBaseBucketItem();
|
|
+
|
|
+ /**
|
|
+ * Gets the sound that is played when this entity
|
|
+ * is picked up in a bucket.
|
|
+ * @return bucket pickup sound
|
|
+ */
|
|
+ @NotNull
|
|
+ Sound getPickupSound();
|
|
+}
|
|
diff --git a/src/main/java/org/bukkit/entity/Axolotl.java b/src/main/java/org/bukkit/entity/Axolotl.java
|
|
index 9763f3b9ac8f32c082a476f4b50a32622b2720a0..c8c738b1b72e9ad89d97b7a1f5450d58045a72ca 100644
|
|
--- a/src/main/java/org/bukkit/entity/Axolotl.java
|
|
+++ b/src/main/java/org/bukkit/entity/Axolotl.java
|
|
@@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull;
|
|
/**
|
|
* An Axolotl.
|
|
*/
|
|
-public interface Axolotl extends Animals {
|
|
+public interface Axolotl extends Animals, io.papermc.paper.entity.Bucketable { // Paper - Bucketable API
|
|
|
|
/**
|
|
* Gets if this axolotl is playing dead.
|
|
diff --git a/src/main/java/org/bukkit/entity/Fish.java b/src/main/java/org/bukkit/entity/Fish.java
|
|
index 82e390b2152e7c881006ca30f2527d160c01f8a1..86da8dc401ed7db19a39bc682721055cd341ccde 100644
|
|
--- a/src/main/java/org/bukkit/entity/Fish.java
|
|
+++ b/src/main/java/org/bukkit/entity/Fish.java
|
|
@@ -3,4 +3,4 @@ package org.bukkit.entity;
|
|
/**
|
|
* Represents a fish entity.
|
|
*/
|
|
-public interface Fish extends WaterMob { }
|
|
+public interface Fish extends WaterMob, io.papermc.paper.entity.Bucketable { } // Paper - Bucketable API
|