Update upstream

This commit is contained in:
William Blake Galbreath
2019-05-04 00:23:04 -05:00
parent 65e4566aa4
commit f74678371d
12 changed files with 174 additions and 287 deletions

View File

@@ -1,4 +1,4 @@
From c1a6fb2046fc75a43cb341155a469a1b22a1243d Mon Sep 17 00:00:00 2001
From 2c54818037c32884b46e0263e6fba858f997ac61 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 3 May 2019 23:45:26 -0500
Subject: [PATCH] Expose Animals#isBreedingItem(ItemStack)
@@ -8,13 +8,13 @@ Subject: [PATCH] Expose Animals#isBreedingItem(ItemStack)
1 file changed, 10 insertions(+)
diff --git a/src/main/java/org/bukkit/entity/Animals.java b/src/main/java/org/bukkit/entity/Animals.java
index 6e214bf4..1295a41e 100644
index 3d4f8c3d..1f0cd380 100644
--- a/src/main/java/org/bukkit/entity/Animals.java
+++ b/src/main/java/org/bukkit/entity/Animals.java
@@ -22,4 +22,14 @@ public interface Animals extends Ageable {
* @param uuid new uuid, or null
@@ -51,4 +51,14 @@ public interface Animals extends Ageable {
* @param ticks the love mode ticks. Must be positive
*/
void setBreedCause(UUID uuid);
void setLoveModeTicks(int ticks);
+
+ // Purpur start
+ /**
@@ -23,7 +23,7 @@ index 6e214bf4..1295a41e 100644
+ * @param itemstack ItemStack to check
+ * @return True if animal can be bred with ItemStack
+ */
+ boolean isBreedingItem(org.bukkit.inventory.ItemStack itemstack);
+ boolean isBreedingItem(@Nullable org.bukkit.inventory.ItemStack itemstack);
+ // Purpur end
}
--