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

@@ -5,7 +5,7 @@ Subject: [PATCH] Make shield blocking delay configurable
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 700ed29f..7ea7ccf0 100644
index 4acd568d0..932cc249a 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -0,0 +0,0 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti