Update to Minecraft 1.10

By: md_5 <git@md-5.net>
2016-06-09 11:43:49 +10:00 · 2016-06-09 11:43:49 +10:00 · a39b7e5f3a
commit a39b7e5f3a
parent 604d9373c0
161 changed files with 1176 additions and 1147 deletions
--- a/paper-server/nms-patches/ContainerMerchant.patch
+++ b/paper-server/nms-patches/ContainerMerchant.patch
@ -9,7 +9,7 @@
 public class ContainerMerchant extends Container {
 
@@ -8,6 +9,19 @@
-     private InventoryMerchant f;
+     private final InventoryMerchant f;
     private final World g;
 
 +    // CraftBukkit start