diff options
author | Travis Watkins <amaranth@ubuntu.com> | 2013-03-13 17:33:27 -0500 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2013-03-15 13:28:59 -0500 |
commit | 83d29e461c85733f0113b6eb19db6e3b42da2949 (patch) | |
tree | b3063a1c28f478ab368d5ba3413a842def68c28f /src/main/java/net/minecraft/server/BlockEnderPortal.java | |
parent | ba6e4c38cfa98ad291974195cc46d70a4f138ac1 (diff) | |
download | craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar.gz craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar.lz craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar.xz craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.zip |
Update CraftBukkit to Minecraft 1.5
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockEnderPortal.java')
-rw-r--r-- | src/main/java/net/minecraft/server/BlockEnderPortal.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/BlockEnderPortal.java b/src/main/java/net/minecraft/server/BlockEnderPortal.java index 6a5b2748..2b400236 100644 --- a/src/main/java/net/minecraft/server/BlockEnderPortal.java +++ b/src/main/java/net/minecraft/server/BlockEnderPortal.java @@ -10,11 +10,11 @@ public class BlockEnderPortal extends BlockContainer { public static boolean a = false; protected BlockEnderPortal(int i, Material material) { - super(i, 0, material); + super(i, material); this.a(1.0F); } - public TileEntity a(World world) { + public TileEntity b(World world) { return new TileEntityEnderPortal(); } @@ -44,7 +44,7 @@ public class BlockEnderPortal extends BlockContainer { EntityPortalEnterEvent event = new EntityPortalEnterEvent(entity.getBukkitEntity(), new org.bukkit.Location(world.getWorld(), i, j, k)); world.getServer().getPluginManager().callEvent(event); // CraftBukkit end - entity.b(1); + entity.c(1); } } @@ -55,7 +55,7 @@ public class BlockEnderPortal extends BlockContainer { public void onPlace(World world, int i, int j, int k) { if (!a) { if (world.worldProvider.dimension != 0) { - world.setTypeId(i, j, k, 0); + world.setAir(i, j, k); } } } |