95 lines
6.1 KiB
Diff
95 lines
6.1 KiB
Diff
--- a/net/minecraft/world/item/ItemBucket.java
|
|
+++ b/net/minecraft/world/item/ItemBucket.java
|
|
@@ -30,6 +30,16 @@
|
|
import net.minecraft.world.phys.MovingObjectPosition;
|
|
import net.minecraft.world.phys.MovingObjectPositionBlock;
|
|
|
|
+// CraftBukkit start
|
|
+import net.minecraft.network.protocol.game.PacketPlayOutBlockChange;
|
|
+import net.minecraft.server.level.WorldServer;
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory;
|
|
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
|
|
+import org.bukkit.craftbukkit.util.DummyGeneratorAccess;
|
|
+import org.bukkit.event.player.PlayerBucketEmptyEvent;
|
|
+import org.bukkit.event.player.PlayerBucketFillEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public class ItemBucket extends Item implements DispensibleContainerItem {
|
|
|
|
public final FluidType content;
|
|
@@ -60,6 +70,17 @@
|
|
|
|
if (block instanceof IFluidSource) {
|
|
IFluidSource ifluidsource = (IFluidSource) block;
|
|
+ // CraftBukkit start
|
|
+ ItemStack dummyFluid = ifluidsource.pickupBlock(entityhuman, DummyGeneratorAccess.INSTANCE, blockposition, iblockdata);
|
|
+ if (dummyFluid.isEmpty()) return EnumInteractionResult.FAIL; // Don't fire event if the bucket won't be filled.
|
|
+ PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent((WorldServer) world, entityhuman, blockposition, blockposition, movingobjectpositionblock.getDirection(), itemstack, dummyFluid.getItem(), enumhand);
|
|
+
|
|
+ if (event.isCancelled()) {
|
|
+ ((EntityPlayer) entityhuman).connection.send(new PacketPlayOutBlockChange(world, blockposition)); // SPIGOT-5163 (see PlayerInteractManager)
|
|
+ ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541
|
|
+ return EnumInteractionResult.FAIL;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
ItemStack itemstack1 = ifluidsource.pickupBlock(entityhuman, world, blockposition, iblockdata);
|
|
|
|
if (!itemstack1.isEmpty()) {
|
|
@@ -68,7 +89,7 @@
|
|
entityhuman.playSound(soundeffect, 1.0F, 1.0F);
|
|
});
|
|
world.gameEvent(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);
|
|
@@ -83,7 +104,7 @@
|
|
IBlockData iblockdata1 = world.getBlockState(blockposition);
|
|
BlockPosition blockposition2 = iblockdata1.getBlock() instanceof IFluidContainer && this.content == FluidTypes.WATER ? blockposition : blockposition1;
|
|
|
|
- if (this.emptyContents(entityhuman, world, blockposition2, movingobjectpositionblock)) {
|
|
+ if (this.emptyContents(entityhuman, world, blockposition2, movingobjectpositionblock, movingobjectpositionblock.getDirection(), blockposition, itemstack, enumhand)) { // CraftBukkit
|
|
this.checkExtraContent(entityhuman, world, itemstack, blockposition2);
|
|
if (entityhuman instanceof EntityPlayer) {
|
|
CriterionTriggers.PLACED_BLOCK.trigger((EntityPlayer) entityhuman, blockposition2, itemstack);
|
|
@@ -112,11 +133,18 @@
|
|
|
|
@Override
|
|
public boolean emptyContents(@Nullable EntityLiving entityliving, World world, BlockPosition blockposition, @Nullable MovingObjectPositionBlock movingobjectpositionblock) {
|
|
+ // CraftBukkit start
|
|
+ return emptyContents(entityliving, world, blockposition, movingobjectpositionblock, null, null, null, EnumHand.MAIN_HAND);
|
|
+ }
|
|
+
|
|
+ public boolean emptyContents(@Nullable EntityLiving entityliving, World world, BlockPosition blockposition, @Nullable MovingObjectPositionBlock movingobjectpositionblock, EnumDirection enumdirection, BlockPosition clicked, ItemStack itemstack, EnumHand enumhand) {
|
|
+ // CraftBukkit end
|
|
FluidType fluidtype = this.content;
|
|
|
|
if (!(fluidtype instanceof FluidTypeFlowing fluidtypeflowing)) {
|
|
return false;
|
|
} else {
|
|
+ IBlockData iblockdata; // CraftBukkit - decompile error
|
|
Block block;
|
|
boolean flag;
|
|
boolean flag1;
|
|
@@ -146,8 +174,18 @@
|
|
|
|
boolean flag2 = flag1;
|
|
|
|
+ // CraftBukkit start
|
|
+ if (flag2 && entityliving instanceof EntityPlayer entityplayer) {
|
|
+ PlayerBucketEmptyEvent event = CraftEventFactory.callPlayerBucketEmptyEvent((WorldServer) world, entityplayer, blockposition, clicked, enumdirection, itemstack, enumhand);
|
|
+ if (event.isCancelled()) {
|
|
+ entityplayer.connection.send(new PacketPlayOutBlockChange(world, blockposition)); // SPIGOT-4238: needed when looking through entity
|
|
+ entityplayer.getBukkitEntity().updateInventory(); // SPIGOT-4541
|
|
+ return false;
|
|
+ }
|
|
+ }
|
|
+ // CraftBukkit end
|
|
if (!flag2) {
|
|
- return movingobjectpositionblock != null && this.emptyContents(entityliving, world, movingobjectpositionblock.getBlockPos().relative(movingobjectpositionblock.getDirection()), (MovingObjectPositionBlock) null);
|
|
+ return movingobjectpositionblock != null && this.emptyContents(entityliving, world, movingobjectpositionblock.getBlockPos().relative(movingobjectpositionblock.getDirection()), (MovingObjectPositionBlock) null, enumdirection, clicked, itemstack, enumhand); // CraftBukkit
|
|
} else if (world.dimensionType().ultraWarm() && this.content.is(TagsFluid.WATER)) {
|
|
int i = blockposition.getX();
|
|
int j = blockposition.getY();
|