Update to Minecraft 1.21

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2024-06-14 01:05:00 +10:00
parent 7c6204e1a9
commit eed041d629
255 changed files with 3585 additions and 3261 deletions

View File

@@ -17,7 +17,7 @@
public class ItemBucket extends Item implements DispensibleContainerItem {
public final FluidType content;
@@ -62,6 +72,17 @@
@@ -63,6 +73,17 @@
if (block instanceof IFluidSource) {
IFluidSource ifluidsource = (IFluidSource) block;
@@ -32,10 +32,10 @@
+ return InteractionResultWrapper.fail(itemstack);
+ }
+ // CraftBukkit end
ItemStack itemstack1 = ifluidsource.pickupBlock(entityhuman, world, blockposition, iblockdata);
itemstack1 = ifluidsource.pickupBlock(entityhuman, world, blockposition, iblockdata);
if (!itemstack1.isEmpty()) {
@@ -70,7 +91,7 @@
@@ -71,7 +92,7 @@
entityhuman.playSound(soundeffect, 1.0F, 1.0F);
});
world.gameEvent((Entity) entityhuman, (Holder) GameEvent.FLUID_PICKUP, blockposition);
@@ -44,7 +44,7 @@
if (!world.isClientSide) {
CriterionTriggers.FILLED_BUCKET.trigger((EntityPlayer) entityhuman, itemstack1);
@@ -85,7 +106,7 @@
@@ -86,7 +107,7 @@
iblockdata = world.getBlockState(blockposition);
BlockPosition blockposition2 = iblockdata.getBlock() instanceof IFluidContainer && this.content == FluidTypes.WATER ? blockposition : blockposition1;
@@ -53,7 +53,7 @@
this.checkExtraContent(entityhuman, world, itemstack, blockposition2);
if (entityhuman instanceof EntityPlayer) {
CriterionTriggers.PLACED_BLOCK.trigger((EntityPlayer) entityhuman, blockposition2, itemstack);
@@ -112,6 +133,12 @@
@@ -114,6 +135,12 @@
@Override
public boolean emptyContents(@Nullable EntityHuman entityhuman, World world, BlockPosition blockposition, @Nullable MovingObjectPositionBlock movingobjectpositionblock) {
@@ -66,7 +66,7 @@
FluidType fluidtype = this.content;
if (!(fluidtype instanceof FluidTypeFlowing fluidtypeflowing)) {
@@ -147,8 +174,18 @@
@@ -149,8 +176,18 @@
boolean flag2 = flag1;