Update to Minecraft 1.15.2

By: md_5 <git@md-5.net>
2020-01-22 08:00:00 +11:00
parent 09a2fa4d96
commit 77b64e0c78
50 changed files with 293 additions and 421 deletions
--- a/paper-server/nms-patches/BlockCauldron.patch
+++ b/paper-server/nms-patches/BlockCauldron.patch
@@ -120,14 +120,14 @@
@@ -125,13 +157,18 @@
 
                     if (i > 0 && item instanceof ItemBanner) {
-                         if (TileEntityBanner.a(itemstack) > 0 && !world.isClientSide) {
+                         if (TileEntityBanner.b(itemstack) > 0 && !world.isClientSide) {
 +                            // CraftBukkit start
 +                            if (!this.changeLevel(world, blockposition, iblockdata, i - 1, entityhuman, CauldronLevelChangeEvent.ChangeReason.BANNER_WASH)) {
 +                                return EnumInteractionResult.SUCCESS;
 +                            }
                             itemstack1 = itemstack.cloneItemStack();
                             itemstack1.setCount(1);
-                             TileEntityBanner.b(itemstack1);
+                             TileEntityBanner.c(itemstack1);
                             entityhuman.a(StatisticList.CLEAN_BANNER);
                             if (!entityhuman.abilities.canInstantlyBuild) {
                                 itemstack.subtract(1);