SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.14-pre5

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-04-23 12:00:00 +10:00
parent 0e98365784
commit a0f2b74c8d
560 changed files with 10642 additions and 10867 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
paper-server/nms-patches/BlockCauldron.patch
View File

@@ -7,7 +7,7 @@
+
public class BlockCauldron extends Block {
public static final BlockStateInteger LEVEL = BlockProperties.af;
public static final BlockStateInteger LEVEL = BlockProperties.al;
@@ -32,8 +34,13 @@
float f = (float) blockposition.getY() + (6.0F + (float) (3 * i)) / 16.0F;
@@ -23,7 +23,7 @@
}
}
@@ -49,18 +56,27 @@
@@ -50,18 +57,27 @@
if (item == Items.WATER_BUCKET) {
if (i < 3 && !world.isClientSide) {
@@ -52,7 +52,7 @@
if (!entityhuman.abilities.canInstantlyBuild) {
itemstack.subtract(1);
if (itemstack.isEmpty()) {
@@ -71,7 +87,8 @@
@@ -72,7 +88,8 @@
}
entityhuman.a(StatisticList.USE_CAULDRON);
@@ -62,7 +62,7 @@
world.a((EntityHuman) null, blockposition, SoundEffects.ITEM_BUCKET_FILL, SoundCategory.BLOCKS, 1.0F, 1.0F);
}
@@ -81,6 +98,10 @@
@@ -82,6 +99,10 @@
if (item == Items.GLASS_BOTTLE) {
if (i > 0 && !world.isClientSide) {
@@ -73,7 +73,7 @@
if (!entityhuman.abilities.canInstantlyBuild) {
itemstack1 = PotionUtil.a(new ItemStack(Items.POTION), Potions.b);
entityhuman.a(StatisticList.USE_CAULDRON);
@@ -95,12 +116,17 @@
@@ -96,12 +117,17 @@
}
world.a((EntityHuman) null, blockposition, SoundEffects.ITEM_BOTTLE_FILL, SoundCategory.BLOCKS, 1.0F, 1.0F);
@@ -92,7 +92,7 @@
if (!entityhuman.abilities.canInstantlyBuild) {
itemstack1 = new ItemStack(Items.GLASS_BOTTLE);
entityhuman.a(StatisticList.USE_CAULDRON);
@@ -111,7 +137,8 @@
@@ -112,7 +138,8 @@
}
world.a((EntityHuman) null, blockposition, SoundEffects.ITEM_BOTTLE_EMPTY, SoundCategory.BLOCKS, 1.0F, 1.0F);
@@ -102,22 +102,22 @@
}
return true;
@@ -120,8 +147,13 @@
ItemArmorColorable itemarmorcolorable = (ItemArmorColorable) item;
@@ -121,8 +148,13 @@
IDyeable idyeable = (IDyeable) item;
if (itemarmorcolorable.e(itemstack) && !world.isClientSide) {
if (idyeable.a(itemstack) && !world.isClientSide) {
+ // CraftBukkit start
+ if (!this.changeLevel(world, blockposition, iblockdata, i - 1, entityhuman, CauldronLevelChangeEvent.ChangeReason.ARMOR_WASH)) {
+ return true;
+ }
itemarmorcolorable.g(itemstack);
idyeable.c(itemstack);
- this.a(world, blockposition, iblockdata, i - 1);
+ // this.a(world, blockposition, iblockdata, i - 1);
+ // CraftBukkit end
entityhuman.a(StatisticList.CLEAN_ARMOR);
return true;
}
@@ -129,13 +161,18 @@
@@ -130,13 +162,18 @@
if (i > 0 && item instanceof ItemBanner) {
if (TileEntityBanner.a(itemstack) > 0 && !world.isClientSide) {
@@ -137,7 +137,7 @@
}
if (itemstack.isEmpty()) {
@@ -172,9 +209,25 @@
@@ -173,9 +210,25 @@
}
}
@@ -163,8 +163,8 @@
+ // CraftBukkit end
}
public void c(World world, BlockPosition blockposition) {
@@ -185,7 +238,7 @@
@Override
@@ -187,7 +240,7 @@
IBlockData iblockdata = world.getType(blockposition);
if ((Integer) iblockdata.get(BlockCauldron.LEVEL) < 3) {