Update upstream

2018-04-22 10:40:36 -04:00
parent bfd81cc275
commit 46d4568f31
17 changed files with 17 additions and 67 deletions
--- a/Spigot-Server-Patches/Configurable-Cartographer-Treasure-Maps.patch
+++ b/Spigot-Server-Patches/Configurable-Cartographer-Treasure-Maps.patch
@@ -28,7 +28,7 @@ index 513c4b020..631aa6eb9 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index cfc8d986f..d0183457e 100644
+index 9d201b14e..57fcc3c05 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 {