geforkt von Mirrors/Paper
108 Zeilen
6.8 KiB
Diff
108 Zeilen
6.8 KiB
Diff
--- a/net/minecraft/server/ItemBucket.java
|
|
+++ b/net/minecraft/server/ItemBucket.java
|
|
@@ -1,6 +1,13 @@
|
|
package net.minecraft.server;
|
|
|
|
import javax.annotation.Nullable;
|
|
+// CraftBukkit start
|
|
+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 {
|
|
|
|
@@ -30,12 +37,22 @@
|
|
if (this.fluidType == FluidTypes.EMPTY) {
|
|
iblockdata = world.getType(blockposition);
|
|
if (iblockdata.getBlock() instanceof IFluidSource) {
|
|
+ // CraftBukkit start
|
|
+ FluidType dummyFluid = ((IFluidSource) iblockdata.getBlock()).removeFluid(DummyGeneratorAccess.INSTANCE, blockposition, iblockdata);
|
|
+ PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent(entityhuman, blockposition.getX(), blockposition.getY(), blockposition.getZ(), null, itemstack, dummyFluid.b());
|
|
+
|
|
+ if (event.isCancelled()) {
|
|
+ ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, blockposition)); // SPIGOT-5163 (see PlayerInteractManager)
|
|
+ ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541
|
|
+ return new InteractionResultWrapper(EnumInteractionResult.FAIL, itemstack);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
FluidType fluidtype = ((IFluidSource) iblockdata.getBlock()).removeFluid(world, blockposition, iblockdata);
|
|
|
|
if (fluidtype != FluidTypes.EMPTY) {
|
|
entityhuman.b(StatisticList.ITEM_USED.b(this));
|
|
entityhuman.a(fluidtype.a(TagsFluid.LAVA) ? SoundEffects.ITEM_BUCKET_FILL_LAVA : SoundEffects.ITEM_BUCKET_FILL, 1.0F, 1.0F);
|
|
- ItemStack itemstack1 = this.a(itemstack, entityhuman, fluidtype.b());
|
|
+ ItemStack itemstack1 = this.a(itemstack, entityhuman, fluidtype.b(), event.getItemStack()); // CraftBukkit
|
|
|
|
if (!world.isClientSide) {
|
|
CriterionTriggers.j.a((EntityPlayer) entityhuman, new ItemStack(fluidtype.b()));
|
|
@@ -50,7 +67,7 @@
|
|
iblockdata = world.getType(blockposition);
|
|
BlockPosition blockposition1 = iblockdata.getBlock() instanceof IFluidContainer && this.fluidType == FluidTypes.WATER ? blockposition : movingobjectpositionblock.getBlockPosition().shift(movingobjectpositionblock.getDirection());
|
|
|
|
- if (this.a(entityhuman, world, blockposition1, movingobjectpositionblock)) {
|
|
+ if (this.a(entityhuman, world, blockposition1, movingobjectpositionblock, movingobjectpositionblock.getDirection(), blockposition, itemstack)) { // CraftBukkit
|
|
this.a(world, itemstack, blockposition1);
|
|
if (entityhuman instanceof EntityPlayer) {
|
|
CriterionTriggers.y.a((EntityPlayer) entityhuman, blockposition1, itemstack);
|
|
@@ -74,16 +91,19 @@
|
|
|
|
public void a(World world, ItemStack itemstack, BlockPosition blockposition) {}
|
|
|
|
- private ItemStack a(ItemStack itemstack, EntityHuman entityhuman, Item item) {
|
|
+ // CraftBukkit - added ob.ItemStack result - TODO: Is this... the right way to handle this?
|
|
+ private ItemStack a(ItemStack itemstack, EntityHuman entityhuman, Item item, org.bukkit.inventory.ItemStack result) {
|
|
if (entityhuman.abilities.canInstantlyBuild) {
|
|
return itemstack;
|
|
} else {
|
|
itemstack.subtract(1);
|
|
if (itemstack.isEmpty()) {
|
|
- return new ItemStack(item);
|
|
+ // CraftBukkit start
|
|
+ return CraftItemStack.asNMSCopy(result);
|
|
} else {
|
|
- if (!entityhuman.inventory.pickup(new ItemStack(item))) {
|
|
- entityhuman.drop(new ItemStack(item), false);
|
|
+ if (!entityhuman.inventory.pickup(CraftItemStack.asNMSCopy(result))) {
|
|
+ entityhuman.drop(CraftItemStack.asNMSCopy(result), false);
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
return itemstack;
|
|
@@ -91,7 +111,13 @@
|
|
}
|
|
}
|
|
|
|
+ // CraftBukkit start
|
|
public boolean a(@Nullable EntityHuman entityhuman, World world, BlockPosition blockposition, @Nullable MovingObjectPositionBlock movingobjectpositionblock) {
|
|
+ return a(entityhuman, world, blockposition, movingobjectpositionblock, null, null, null);
|
|
+ }
|
|
+
|
|
+ public boolean a(EntityHuman entityhuman, World world, BlockPosition blockposition, @Nullable MovingObjectPositionBlock movingobjectpositionblock, EnumDirection enumdirection, BlockPosition clicked, ItemStack itemstack) {
|
|
+ // CraftBukkit end
|
|
if (!(this.fluidType instanceof FluidTypeFlowing)) {
|
|
return false;
|
|
} else {
|
|
@@ -101,8 +127,18 @@
|
|
boolean flag1 = material.isReplaceable();
|
|
|
|
if (!world.isEmpty(blockposition) && !flag && !flag1 && (!(iblockdata.getBlock() instanceof IFluidContainer) || !((IFluidContainer) iblockdata.getBlock()).canPlace(world, blockposition, iblockdata, this.fluidType))) {
|
|
- return movingobjectpositionblock == null ? false : this.a(entityhuman, world, movingobjectpositionblock.getBlockPosition().shift(movingobjectpositionblock.getDirection()), (MovingObjectPositionBlock) null);
|
|
+ return movingobjectpositionblock == null ? false : this.a(entityhuman, world, movingobjectpositionblock.getBlockPosition().shift(movingobjectpositionblock.getDirection()), (MovingObjectPositionBlock) null, enumdirection, clicked, itemstack); // CraftBukkit
|
|
} else {
|
|
+ // CraftBukkit start
|
|
+ if (entityhuman != null) {
|
|
+ PlayerBucketEmptyEvent event = CraftEventFactory.callPlayerBucketEmptyEvent(entityhuman, clicked.getX(), clicked.getY(), clicked.getZ(), enumdirection, itemstack);
|
|
+ if (event.isCancelled()) {
|
|
+ ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, blockposition)); // SPIGOT-4238: needed when looking through entity
|
|
+ ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541
|
|
+ return false;
|
|
+ }
|
|
+ }
|
|
+ // CraftBukkit end
|
|
if (world.worldProvider.isNether() && this.fluidType.a(TagsFluid.WATER)) {
|
|
int i = blockposition.getX();
|
|
int j = blockposition.getY();
|