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

Update to Minecraft 1.20

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2023-06-08 01:30:00 +10:00
parent bac55e67d6
commit 9d740b84b0
269 changed files with 2605 additions and 2568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
paper-server/nms-patches/net/minecraft/core/cauldron/CauldronInteraction.patch
View File

@@ -41,10 +41,10 @@
+ return EnumInteractionResult.SUCCESS;
+ }
+ // CraftBukkit end
ItemStack itemstack1 = itemstack.copy();
ItemStack itemstack1 = itemstack.copyWithCount(1);
itemstack1.setCount(1);
@@ -87,7 +101,7 @@
TileEntityBanner.removeLastPattern(itemstack1);
@@ -86,7 +100,7 @@
}
entityhuman.awardStat(StatisticList.CLEAN_BANNER);
@@ -53,7 +53,7 @@
}
return EnumInteractionResult.sidedSuccess(world.isClientSide);
@@ -105,9 +119,14 @@
@@ -104,9 +118,14 @@
return EnumInteractionResult.PASS;
} else {
if (!world.isClientSide) {
@@ -69,7 +69,7 @@
}
return EnumInteractionResult.sidedSuccess(world.isClientSide);
@@ -116,7 +135,7 @@
@@ -115,7 +134,7 @@
};
static Object2ObjectOpenHashMap<Item, CauldronInteraction> newInteractionMap() {
@@ -78,7 +78,7 @@
object2objectopenhashmap.defaultReturnValue((iblockdata, world, blockposition, entityhuman, enumhand, itemstack) -> {
return EnumInteractionResult.PASS;
});
@@ -132,12 +151,17 @@
@@ -131,12 +150,17 @@
return EnumInteractionResult.PASS;
} else {
if (!world.isClientSide) {
@@ -97,7 +97,7 @@
world.playSound((EntityHuman) null, blockposition, SoundEffects.BOTTLE_EMPTY, SoundCategory.BLOCKS, 1.0F, 1.0F);
world.gameEvent((Entity) null, GameEvent.FLUID_PLACE, blockposition);
}
@@ -153,12 +177,17 @@
@@ -152,12 +176,17 @@
});
CauldronInteraction.WATER.put(Items.GLASS_BOTTLE, (iblockdata, world, blockposition, entityhuman, enumhand, itemstack) -> {
if (!world.isClientSide) {
@@ -116,7 +116,7 @@
world.playSound((EntityHuman) null, blockposition, SoundEffects.BOTTLE_FILL, SoundCategory.BLOCKS, 1.0F, 1.0F);
world.gameEvent((Entity) null, GameEvent.FLUID_PICKUP, blockposition);
}
@@ -168,10 +197,15 @@
@@ -167,10 +196,15 @@
CauldronInteraction.WATER.put(Items.POTION, (iblockdata, world, blockposition, entityhuman, enumhand, itemstack) -> {
if ((Integer) iblockdata.getValue(LayeredCauldronBlock.LEVEL) != 3 && PotionUtil.getPotion(itemstack) == Potions.WATER) {
if (!world.isClientSide) {
@@ -133,7 +133,7 @@
world.playSound((EntityHuman) null, blockposition, SoundEffects.BOTTLE_EMPTY, SoundCategory.BLOCKS, 1.0F, 1.0F);
world.gameEvent((Entity) null, GameEvent.FLUID_PLACE, blockposition);
}
@@ -243,12 +277,17 @@
@@ -242,12 +276,17 @@
return EnumInteractionResult.PASS;
} else {
if (!world.isClientSide) {
@@ -152,7 +152,7 @@
world.playSound((EntityHuman) null, blockposition, soundeffect, SoundCategory.BLOCKS, 1.0F, 1.0F);
world.gameEvent((Entity) null, GameEvent.FLUID_PICKUP, blockposition);
}
@@ -259,12 +298,17 @@
@@ -258,12 +297,17 @@
static EnumInteractionResult emptyBucket(World world, BlockPosition blockposition, EntityHuman entityhuman, EnumHand enumhand, ItemStack itemstack, IBlockData iblockdata, SoundEffect soundeffect) {
if (!world.isClientSide) {