Update to Minecraft 1.14-pre5

By: md_5 <git@md-5.net>
2019-04-23 12:00:00 +10:00
parent 0e98365784
commit a0f2b74c8d
560 changed files with 10642 additions and 10867 deletions
--- a/paper-server/nms-patches/BlockCactus.patch
+++ b/paper-server/nms-patches/BlockCactus.patch
@@ -8,8 +8,8 @@
 +
 public class BlockCactus extends Block {
 
-     public static final BlockStateInteger AGE = BlockProperties.X;
-@@ -31,7 +33,7 @@
+     public static final BlockStateInteger AGE = BlockProperties.ad;
+@@ -32,7 +34,7 @@
                     int j = (Integer) iblockdata.get(BlockCactus.AGE);
 
                     if (j == 15) {
@@ -18,13 +18,13 @@
                         IBlockData iblockdata1 = (IBlockData) iblockdata.set(BlockCactus.AGE, 0);
 
                         world.setTypeAndData(blockposition, iblockdata1, 4);
-@@ -92,7 +94,9 @@
-     }
+@@ -95,7 +97,9 @@
 
+     @Override
     public void a(IBlockData iblockdata, World world, BlockPosition blockposition, Entity entity) {
 +        CraftEventFactory.blockDamage = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()); // CraftBukkit
         entity.damageEntity(DamageSource.CACTUS, 1.0F);
 +        CraftEventFactory.blockDamage = null; // CraftBukkit
     }
 
-     public TextureType c() {
+     @Override