summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/ItemBucket.java
diff options
context:
space:
mode:
authorErik Broes <erikbroes@grum.nl>2011-05-14 16:29:42 +0200
committerErik Broes <erikbroes@grum.nl>2011-05-15 13:41:46 +0200
commit309846d732849b68e382c53bf3a0d7a6dfd82579 (patch)
tree020932a024cd2fb20895f5834a2bde7dbdfea583 /src/main/java/net/minecraft/server/ItemBucket.java
parente54d8c33529b9495b9ca1a610dc2ff9fc5ac84b5 (diff)
downloadcraftbukkit-309846d732849b68e382c53bf3a0d7a6dfd82579.tar
craftbukkit-309846d732849b68e382c53bf3a0d7a6dfd82579.tar.gz
craftbukkit-309846d732849b68e382c53bf3a0d7a6dfd82579.tar.lz
craftbukkit-309846d732849b68e382c53bf3a0d7a6dfd82579.tar.xz
craftbukkit-309846d732849b68e382c53bf3a0d7a6dfd82579.zip
Whitespace + general cleanup
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemBucket.java')
-rw-r--r--src/main/java/net/minecraft/server/ItemBucket.java16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java
index 45aedd10..e1c2866a 100644
--- a/src/main/java/net/minecraft/server/ItemBucket.java
+++ b/src/main/java/net/minecraft/server/ItemBucket.java
@@ -78,7 +78,7 @@ public class ItemBucket extends Item {
// CraftBukkit end
world.setTypeId(i, j, k, 0);
- return new ItemStack(itemInHand.getTypeId(), itemInHand.getAmount(), data ); // CraftBukkit
+ return new ItemStack(itemInHand.getTypeId(), itemInHand.getAmount(), data); // CraftBukkit
}
} else {
if (this.a < 0) {
@@ -91,10 +91,11 @@ public class ItemBucket extends Item {
CraftItemStack itemInHand = (CraftItemStack) event.getItemStack();
byte data = itemInHand.getData() == null ? (byte) 0 : itemInHand.getData().getData();
- return new ItemStack(itemInHand.getTypeId(), itemInHand.getAmount(), data );
- // CraftBukkit end
+ return new ItemStack(itemInHand.getTypeId(), itemInHand.getAmount(), data);
}
- int clickedX = i, clickedY = j, clickedZ = k; // CraftBukkit
+
+ int clickedX = i, clickedY = j, clickedZ = k;
+ // CraftBukkit end
if (movingobjectposition.face == 0) {
--j;
@@ -142,12 +143,13 @@ public class ItemBucket extends Item {
// CraftBukkit start
CraftItemStack itemInHand = (CraftItemStack) event.getItemStack();
byte data = itemInHand.getData() == null ? (byte) 0 : itemInHand.getData().getData();
- return new ItemStack(itemInHand.getTypeId(), itemInHand.getAmount(), data );
+
+ return new ItemStack(itemInHand.getTypeId(), itemInHand.getAmount(), data);
// CraftBukkit end
}
}
} else if (this.a == 0 && movingobjectposition.entity instanceof EntityCow) {
- // CraftBukkit start -- This codepath seems to be *NEVER* called
+ // CraftBukkit start - This codepath seems to be *NEVER* called
Location loc = movingobjectposition.entity.getBukkitEntity().getLocation();
PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent(entityhuman, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ(), -1, itemstack, Item.MILK_BUCKET);
@@ -157,7 +159,7 @@ public class ItemBucket extends Item {
CraftItemStack itemInHand = (CraftItemStack) event.getItemStack();
byte data = itemInHand.getData() == null ? (byte) 0 : itemInHand.getData().getData();
- return new ItemStack(itemInHand.getTypeId(), itemInHand.getAmount(), data );
+ return new ItemStack(itemInHand.getTypeId(), itemInHand.getAmount(), data);
// CraftBukkit end
}