Update Upstream

This commit is contained in:
Aikar
2018-07-21 16:03:10 -04:00
parent df8c42d4ad
commit 97d99711ff
23 changed files with 93 additions and 77 deletions

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Implement EntityKnockbackByEntityEvent
This event is called when an entity receives knockback by another entity.
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index ab3246ee02..f67b4ca353 100644
index dffa42ba5..7cacbaffe 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {