summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server
diff options
context:
space:
mode:
authorDinnerbone <dinnerbone@dinnerbone.com>2011-03-27 20:57:46 +0100
committerDinnerbone <dinnerbone@dinnerbone.com>2011-03-27 20:57:46 +0100
commitc47db7092bec39a13c757fa7824eeca33db0cab7 (patch)
tree807252b1c0c9f18804d1269200042d78fd4633f9 /src/main/java/net/minecraft/server
parentf1ffeb256d6df267553333a1899c748ff95b68fc (diff)
downloadcraftbukkit-c47db7092bec39a13c757fa7824eeca33db0cab7.tar
craftbukkit-c47db7092bec39a13c757fa7824eeca33db0cab7.tar.gz
craftbukkit-c47db7092bec39a13c757fa7824eeca33db0cab7.tar.lz
craftbukkit-c47db7092bec39a13c757fa7824eeca33db0cab7.tar.xz
craftbukkit-c47db7092bec39a13c757fa7824eeca33db0cab7.zip
Line endings, damnit!
Diffstat (limited to 'src/main/java/net/minecraft/server')
-rw-r--r--src/main/java/net/minecraft/server/ItemBucket.java8
-rw-r--r--src/main/java/net/minecraft/server/ItemInWorldManager.java2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java
index fe9b859f..cad9727e 100644
--- a/src/main/java/net/minecraft/server/ItemBucket.java
+++ b/src/main/java/net/minecraft/server/ItemBucket.java
@@ -53,7 +53,7 @@ public class ItemBucket extends Item {
if (world.getMaterial(i, j, k) == Material.WATER && world.getData(i, j, k) == 0) {
// CraftBukkit start
PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent(entityhuman, i, j, k, -1, itemstack, Item.WATER_BUCKET);
-
+
if (event.isCancelled()) {
return itemstack;
}
@@ -68,7 +68,7 @@ public class ItemBucket extends Item {
if (world.getMaterial(i, j, k) == Material.LAVA && world.getData(i, j, k) == 0) {
// CraftBukkit start
- PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent(entityhuman, i, j, k, -1, itemstack, Item.LAVA_BUCKET);
+ PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent(entityhuman, i, j, k, -1, itemstack, Item.LAVA_BUCKET);
if (event.isCancelled()) {
return itemstack;
@@ -84,7 +84,7 @@ public class ItemBucket extends Item {
} else {
if (this.a < 0) {
// CraftBukkit start
- PlayerBucketEmptyEvent event = CraftEventFactory.callPlayerBucketEmptyEvent(entityhuman, i, j, k, movingobjectposition.e, itemstack);
+ PlayerBucketEmptyEvent event = CraftEventFactory.callPlayerBucketEmptyEvent(entityhuman, i, j, k, movingobjectposition.e, itemstack);
if (event.isCancelled()) {
return itemstack;
@@ -129,7 +129,7 @@ public class ItemBucket extends Item {
return itemstack;
}
// CraftBukkit end
-
+
if (world.m.d && this.a == Block.WATER.id) {
world.a(d0 + 0.5D, d1 + 0.5D, d2 + 0.5D, "random.fizz", 0.5F, 2.6F + (world.k.nextFloat() - world.k.nextFloat()) * 0.8F);
diff --git a/src/main/java/net/minecraft/server/ItemInWorldManager.java b/src/main/java/net/minecraft/server/ItemInWorldManager.java
index 23a926f1..2c1d4377 100644
--- a/src/main/java/net/minecraft/server/ItemInWorldManager.java
+++ b/src/main/java/net/minecraft/server/ItemInWorldManager.java
@@ -70,7 +70,7 @@ public class ItemInWorldManager {
if (l == Block.WOODEN_DOOR.id) {
// For some reason *BOTH* the bottom/top part have to be marked updated.
boolean bottom = (this.b.getData(i, j, k) & 8) == 0;
- ((EntityPlayer) this.a).a.b((Packet) (new Packet53BlockChange(i, j, k, this.b)));
+ ((EntityPlayer) this.a).a.b((Packet) (new Packet53BlockChange(i, j, k, this.b)));
((EntityPlayer) this.a).a.b((Packet) (new Packet53BlockChange(i, j + (bottom ? 1 : -1), k, this.b)));
}
} else {