Update upstream B/CB

This commit is contained in:
Zach Brown 2016-08-07 00:01:31 -05:00
parent 01a09f8ff1
commit 15f3ca7ecb
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
12 changed files with 48 additions and 48 deletions

View file

@ -1,14 +1,14 @@
From 578d1f92b19a427d2deb9ded55c699ea9fdbdec4 Mon Sep 17 00:00:00 2001
From ebe7bf9e6ebef527817214387e1696bcb5ecd7ce Mon Sep 17 00:00:00 2001
From: mrapple <tony@oc.tc>
Date: Sun, 25 Nov 2012 13:47:27 -0600
Subject: [PATCH] Add methods for working with arrows stuck in living entities
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 22de9f7..570da41 100644
index 69eda6d..0c12311 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -416,4 +416,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
@@ -426,4 +426,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
* @return collision status
*/
boolean isCollidable();
@ -29,5 +29,5 @@ index 22de9f7..570da41 100644
+ // Paper end
}
--
2.8.0
2.9.2.windows.1