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

Update to Minecraft 1.20.5

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2024-04-24 01:15:00 +10:00
parent 4deda9501f
commit 65bc2541a3
524 changed files with 7788 additions and 6181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
paper-server/nms-patches/net/minecraft/world/item/ItemBucket.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/item/ItemBucket.java
+++ b/net/minecraft/world/item/ItemBucket.java
@@ -29,6 +29,16 @@
@@ -30,6 +30,16 @@
import net.minecraft.world.phys.MovingObjectPosition;
import net.minecraft.world.phys.MovingObjectPositionBlock;
@@ -17,7 +17,7 @@
public class ItemBucket extends Item implements DispensibleContainerItem {
public final FluidType content;
@@ -61,6 +71,17 @@
@@ -62,6 +72,17 @@
if (block instanceof IFluidSource) {
IFluidSource ifluidsource = (IFluidSource) block;
@@ -35,16 +35,16 @@
ItemStack itemstack1 = ifluidsource.pickupBlock(entityhuman, world, blockposition, iblockdata);
if (!itemstack1.isEmpty()) {
@@ -69,7 +90,7 @@
@@ -70,7 +91,7 @@
entityhuman.playSound(soundeffect, 1.0F, 1.0F);
});
world.gameEvent((Entity) entityhuman, GameEvent.FLUID_PICKUP, blockposition);
world.gameEvent((Entity) entityhuman, (Holder) GameEvent.FLUID_PICKUP, blockposition);
- ItemStack itemstack2 = ItemLiquidUtil.createFilledResult(itemstack, entityhuman, itemstack1);
+ ItemStack itemstack2 = ItemLiquidUtil.createFilledResult(itemstack, entityhuman, CraftItemStack.asNMSCopy(event.getItemStack())); // CraftBukkit
if (!world.isClientSide) {
CriterionTriggers.FILLED_BUCKET.trigger((EntityPlayer) entityhuman, itemstack1);
@@ -84,7 +105,7 @@
@@ -85,7 +106,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);
@@ -111,6 +132,12 @@
@@ -112,6 +133,12 @@
@Override
public boolean emptyContents(@Nullable EntityHuman entityhuman, World world, BlockPosition blockposition, @Nullable MovingObjectPositionBlock movingobjectpositionblock) {
@@ -65,8 +65,8 @@
+ // CraftBukkit end
FluidType fluidtype = this.content;
if (!(fluidtype instanceof FluidTypeFlowing)) {
@@ -148,8 +175,18 @@
if (!(fluidtype instanceof FluidTypeFlowing fluidtypeflowing)) {
@@ -147,8 +174,18 @@
boolean flag2 = flag1;