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 da7bd1e9e1fec941548c8ee4694263d5db60384a Mon Sep 17 00:00:00 2001
From 39c6bbb0f6744af41f73aa9e1fce7b542d4795d7 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 3 May 2019 23:45:45 -0500
Subject: [PATCH] Expose Animals#isBreedingItem(ItemStack)
@@ -8,12 +8,12 @@ Subject: [PATCH] Expose Animals#isBreedingItem(ItemStack)
1 file changed, 7 insertions(+)
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAnimals.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAnimals.java
index 2478b934..5431d65a 100644
index b06909c3e..63ddecb1a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAnimals.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAnimals.java
@@ -30,4 +30,11 @@ public class CraftAnimals extends CraftAgeable implements Animals {
public void setBreedCause(UUID uuid) {
getHandle().breedCause = uuid;
@@ -47,4 +47,11 @@ public class CraftAnimals extends CraftAgeable implements Animals {
public int getLoveModeTicks() {
return getHandle().bC; // PAIL rename loveTicks
}
+
+ // Purpur start