Update upstream

This commit is contained in:
Aikar
2018-08-01 22:49:47 -04:00
parent 5d5faf3cc6
commit 66db17bdd4
11 changed files with 14 additions and 14 deletions

View File

@@ -32,7 +32,7 @@ index 4455dc4891..8be1ba5269 100644
return this.isHandRaised() ? this.activeItem.k() - this.cX() : 0;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index d7344809ec..e199d08377 100644
index fab1af7159..71e0da894b 100644
--- 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 {