summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/ItemBoat.java
diff options
context:
space:
mode:
authorErik Broes <erikbroes@ripe.net>2011-01-11 09:25:13 +0100
committerErik Broes <erikbroes@ripe.net>2011-01-11 09:27:35 +0100
commit22dab8e9855b1d2aabb1ba10b16ebd5ae5943da4 (patch)
tree879d89e9f5d260f70a8199c42c1b0320b423fe17 /src/main/java/net/minecraft/server/ItemBoat.java
parent75654e8db5b97497f6285266a1116a536d80720c (diff)
downloadcraftbukkit-22dab8e9855b1d2aabb1ba10b16ebd5ae5943da4.tar
craftbukkit-22dab8e9855b1d2aabb1ba10b16ebd5ae5943da4.tar.gz
craftbukkit-22dab8e9855b1d2aabb1ba10b16ebd5ae5943da4.tar.lz
craftbukkit-22dab8e9855b1d2aabb1ba10b16ebd5ae5943da4.tar.xz
craftbukkit-22dab8e9855b1d2aabb1ba10b16ebd5ae5943da4.zip
Updated against new mc-dev format, takes out quite some casting troubles at the cost of extra ()'s
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemBoat.java')
-rw-r--r--src/main/java/net/minecraft/server/ItemBoat.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/net/minecraft/server/ItemBoat.java b/src/main/java/net/minecraft/server/ItemBoat.java
index 61102abb..659b4e1b 100644
--- a/src/main/java/net/minecraft/server/ItemBoat.java
+++ b/src/main/java/net/minecraft/server/ItemBoat.java
@@ -1,11 +1,12 @@
package net.minecraft.server;
+// CraftBukkit start
import org.bukkit.craftbukkit.CraftBlock;
import org.bukkit.craftbukkit.CraftItemStack;
import org.bukkit.craftbukkit.CraftPlayer;
import org.bukkit.event.Event.Type;
import org.bukkit.event.player.PlayerItemEvent;
-
+// CraftBukkit end
public class ItemBoat extends Item {
@@ -42,22 +43,21 @@ public class ItemBoat extends Item {
int k = movingobjectposition.d;
if (!world.z) {
- // Craftbukkit start
- // Boat placement
+ // CraftBukkit start - Boat placement
CraftBlock blockClicked = (CraftBlock) ((WorldServer) world).getWorld().getBlockAt(i, j, k);
CraftItemStack itemInHand = new CraftItemStack(itemstack);
CraftPlayer thePlayer = new CraftPlayer(((WorldServer) world).getServer(), (EntityPlayerMP) entityplayer);
PlayerItemEvent pie = new PlayerItemEvent(Type.PLAYER_ITEM, thePlayer, itemInHand, blockClicked, CraftBlock.notchToBlockFace(movingobjectposition.e));
-
+
((WorldServer) world).getServer().getPluginManager().callEvent(pie);
-
+
if (pie.isCancelled()) return itemstack;
-
- world.a(new EntityBoat(world, (float) i + 0.5F, (float) j + 1.5F, (float) k + 0.5F));
+ // CraftBukkit end
+
+ world.a(((Entity) (new EntityBoat(world, (float) i + 0.5F, (float) j + 1.5F, (float) k + 0.5F))));
}
itemstack.a--;
}
return itemstack;
}
}
-