111 Zeilen
6.0 KiB
Diff
111 Zeilen
6.0 KiB
Diff
--- a/net/minecraft/server/ItemBucket.java
|
|
+++ b/net/minecraft/server/ItemBucket.java
|
|
@@ -1,6 +1,12 @@
|
|
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.event.player.PlayerBucketEmptyEvent;
|
|
+import org.bukkit.event.player.PlayerBucketFillEvent;
|
|
+// CraftBukkit end
|
|
|
|
public class ItemBucket extends Item {
|
|
|
|
@@ -34,15 +40,29 @@
|
|
Material material = iblockdata.getMaterial();
|
|
|
|
if (material == Material.WATER && ((Integer) iblockdata.get(BlockFluids.LEVEL)).intValue() == 0) {
|
|
+ // CraftBukkit start
|
|
+ PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent(entityhuman, blockposition.getX(), blockposition.getY(), blockposition.getZ(), null, itemstack, Items.WATER_BUCKET);
|
|
+
|
|
+ if (event.isCancelled()) {
|
|
+ return new InteractionResultWrapper(EnumInteractionResult.FAIL, itemstack);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
world.setTypeAndData(blockposition, Blocks.AIR.getBlockData(), 11);
|
|
entityhuman.b(StatisticList.b((Item) this));
|
|
entityhuman.a(SoundEffects.S, 1.0F, 1.0F);
|
|
- return new InteractionResultWrapper(EnumInteractionResult.SUCCESS, this.a(itemstack, entityhuman, Items.WATER_BUCKET));
|
|
+ return new InteractionResultWrapper(EnumInteractionResult.SUCCESS, this.a(itemstack, entityhuman, Items.WATER_BUCKET, event.getItemStack())); // CraftBukkit
|
|
} else if (material == Material.LAVA && ((Integer) iblockdata.get(BlockFluids.LEVEL)).intValue() == 0) {
|
|
+ // CraftBukkit start
|
|
+ PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent(entityhuman, blockposition.getX(), blockposition.getY(), blockposition.getZ(), null, itemstack, Items.LAVA_BUCKET);
|
|
+
|
|
+ if (event.isCancelled()) {
|
|
+ return new InteractionResultWrapper(EnumInteractionResult.FAIL, itemstack);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
entityhuman.a(SoundEffects.T, 1.0F, 1.0F);
|
|
world.setTypeAndData(blockposition, Blocks.AIR.getBlockData(), 11);
|
|
entityhuman.b(StatisticList.b((Item) this));
|
|
- return new InteractionResultWrapper(EnumInteractionResult.SUCCESS, this.a(itemstack, entityhuman, Items.LAVA_BUCKET));
|
|
+ return new InteractionResultWrapper(EnumInteractionResult.SUCCESS, this.a(itemstack, entityhuman, Items.LAVA_BUCKET, event.getItemStack())); // CraftBukkit
|
|
} else {
|
|
return new InteractionResultWrapper(EnumInteractionResult.FAIL, itemstack);
|
|
}
|
|
@@ -53,7 +73,7 @@
|
|
|
|
if (!entityhuman.a(blockposition1, movingobjectposition.direction, itemstack)) {
|
|
return new InteractionResultWrapper(EnumInteractionResult.FAIL, itemstack);
|
|
- } else if (this.a(entityhuman, world, blockposition1)) {
|
|
+ } else if (this.a(entityhuman, world, blockposition1, movingobjectposition.direction, blockposition, itemstack)) { // CraftBukkit
|
|
if (entityhuman instanceof EntityPlayer) {
|
|
CriterionTriggers.x.a((EntityPlayer) entityhuman, blockposition, itemstack);
|
|
}
|
|
@@ -67,16 +87,19 @@
|
|
}
|
|
}
|
|
|
|
- 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;
|
|
@@ -84,7 +107,13 @@
|
|
}
|
|
}
|
|
|
|
+ // CraftBukkit start
|
|
public boolean a(@Nullable EntityHuman entityhuman, World world, BlockPosition blockposition) {
|
|
+ return a(entityhuman, world, blockposition, null, blockposition, null);
|
|
+ }
|
|
+
|
|
+ public boolean a(EntityHuman entityhuman, World world, BlockPosition blockposition, EnumDirection enumdirection, BlockPosition clicked, ItemStack itemstack) {
|
|
+ // CraftBukkit end
|
|
if (this.a == Blocks.AIR) {
|
|
return false;
|
|
} else {
|
|
@@ -96,6 +125,15 @@
|
|
if (!world.isEmpty(blockposition) && !flag && !flag1) {
|
|
return false;
|
|
} else {
|
|
+ // CraftBukkit start
|
|
+ if (entityhuman != null) {
|
|
+ PlayerBucketEmptyEvent event = CraftEventFactory.callPlayerBucketEmptyEvent(entityhuman, clicked.getX(), clicked.getY(), clicked.getZ(), enumdirection, itemstack);
|
|
+ if (event.isCancelled()) {
|
|
+ // TODO: inventory not updated
|
|
+ return false;
|
|
+ }
|
|
+ }
|
|
+ // CraftBukkit end
|
|
if (world.worldProvider.l() && this.a == Blocks.FLOWING_WATER) {
|
|
int i = blockposition.getX();
|
|
int j = blockposition.getY();
|