mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-27 15:00:13 +01:00
Update upstream B/CB/S
This commit is contained in:
parent
d26051ef63
commit
f5d7e2067d
4 changed files with 7 additions and 7 deletions
|
@ -1,14 +1,14 @@
|
|||
From 4b969a109049472e8b5f46d689e7e033e2dd1196 Mon Sep 17 00:00:00 2001
|
||||
From 0f430fe8265660cff8b880f01a04d7b59c420cbc 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 69eda6d..0c12311 100644
|
||||
index a938b61..af3d1e5 100644
|
||||
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
@@ -426,4 +426,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
|
||||
@@ -428,4 +428,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
|
||||
* @return collision status
|
||||
*/
|
||||
boolean isCollidable();
|
||||
|
@ -29,5 +29,5 @@ index 69eda6d..0c12311 100644
|
|||
+ // Paper end
|
||||
}
|
||||
--
|
||||
2.9.2.windows.1
|
||||
2.9.3
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 9fdd2ce60dbe09ee2a44cba21f409a18fd159cdc
|
||||
Subproject commit 9d85e3f475303d7f5bfe8e8b5dee1bd8509ec838
|
|
@ -1 +1 @@
|
|||
Subproject commit 48b88ed202ac122eea91d55b61c411e519ac2796
|
||||
Subproject commit 8788b79a48a324130c400658c13f8176787d742a
|
|
@ -1 +1 @@
|
|||
Subproject commit f9671b84fbd5192fdbf13c0f9072f1d608f94f2e
|
||||
Subproject commit 80fccb72715ba063c2ec0e038bf7ddb2599849ad
|
Loading…
Reference in a new issue