Update upstream B/CB/Spigot and rebuild

This commit is contained in:
Zach Brown
2016-03-27 20:48:50 -05:00
parent 4634458d72
commit 587aaefcc4
5 changed files with 8 additions and 9 deletions

View File

@@ -26,8 +26,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
public boolean hasAI() {
return (this.getHandle() instanceof EntityInsentient) ? !((EntityInsentient) this.getHandle()).cR() : false; // PAIL: rename
public boolean isCollidable() {
return getHandle().collides;
}
+
+ // Paper start