Update upstream

This commit is contained in:
Aikar
2018-04-22 10:40:36 -04:00
parent bfd81cc275
commit 46d4568f31
17 changed files with 17 additions and 67 deletions

View File

@@ -156,7 +156,7 @@ index 0255986fd..e14f614f5 100644
this.die();
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index d0183457e..812e88e58 100644
index 57fcc3c05..a9c4ab10d 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -0,0 +0,0 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {