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

Update to Minecraft 1.19

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2022-06-08 02:00:00 +10:00
parent 91d9aa9a89
commit 25f3b50f6b
332 changed files with 3628 additions and 2559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
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;
@@ -59,6 +69,17 @@
@@ -60,6 +70,17 @@
iblockdata = world.getBlockState(blockposition);
if (iblockdata.getBlock() instanceof IFluidSource) {
IFluidSource ifluidsource = (IFluidSource) iblockdata.getBlock();
@@ -35,16 +35,16 @@
ItemStack itemstack1 = ifluidsource.pickupBlock(world, blockposition, iblockdata);
if (!itemstack1.isEmpty()) {
@@ -67,7 +88,7 @@
@@ -68,7 +89,7 @@
entityhuman.playSound(soundeffect, 1.0F, 1.0F);
});
world.gameEvent(entityhuman, GameEvent.FLUID_PICKUP, blockposition);
world.gameEvent((Entity) entityhuman, 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);
@@ -82,7 +103,7 @@
@@ -83,7 +104,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);
@@ -109,6 +130,11 @@
@@ -110,6 +131,11 @@
@Override
public boolean emptyContents(@Nullable EntityHuman entityhuman, World world, BlockPosition blockposition, @Nullable MovingObjectPositionBlock movingobjectpositionblock) {
@@ -65,7 +65,7 @@
if (!(this.content instanceof FluidTypeFlowing)) {
return false;
} else {
@@ -118,8 +144,18 @@
@@ -119,8 +145,18 @@
boolean flag = iblockdata.canBeReplaced(this.content);
boolean flag1 = iblockdata.isAir() || flag || block instanceof IFluidContainer && ((IFluidContainer) block).canPlaceLiquid(world, blockposition, iblockdata, this.content);