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 6816e0b0ac5b4b26973d7dc7e454c7ce9958bc0c Mon Sep 17 00:00:00 2001
From 16828d4dec0fbb8ce61a353ec4c952e4937211e8 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 3 May 2019 06:08:35 -0500
Subject: [PATCH] Integrate ridables
@@ -8,10 +8,10 @@ Subject: [PATCH] Integrate ridables
1 file changed, 16 insertions(+)
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 34a8fe3f..a292ea93 100644
index 956d6886..c10e735e 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -635,4 +635,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -649,4 +649,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
*/
boolean isHandRaised();
// Paper end