From 52d594a66b3f8c1f3579eb386d671f33985c6447 Mon Sep 17 00:00:00 2001 From: Adubbz Date: Mon, 1 Apr 2013 17:24:04 +1100 Subject: [PATCH] Fixed ancient staff broken commit --- .../biomesop/items/ItemAncientStaff.java | 226 +++++++++--------- 1 file changed, 117 insertions(+), 109 deletions(-) diff --git a/src/minecraft/tdwp_ftw/biomesop/items/ItemAncientStaff.java b/src/minecraft/tdwp_ftw/biomesop/items/ItemAncientStaff.java index 9661d0ed7..4d61cadad 100644 --- a/src/minecraft/tdwp_ftw/biomesop/items/ItemAncientStaff.java +++ b/src/minecraft/tdwp_ftw/biomesop/items/ItemAncientStaff.java @@ -35,117 +35,125 @@ public class ItemAncientStaff extends Item public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { if (par3EntityPlayer.dimension == 0) + { + + if (par2World.getBlockId(0, 64 - 32, 0) != mod_BiomesOPlenty.promisedPortal.blockID) { - par3EntityPlayer.addChatMessage("A gateway to the Promised Land has been buried at the origin of this world."); - - int var99 = 32; - - par2World.setBlock(-1, 62 - var99, 1, Block.whiteStone.blockID); - par2World.setBlock(0, 62 - var99, 1, Block.whiteStone.blockID); - par2World.setBlock(1, 62 - var99, 1, Block.whiteStone.blockID); - par2World.setBlock(1, 62 - var99, 0, Block.whiteStone.blockID); - par2World.setBlock(1, 62 - var99, -1, Block.whiteStone.blockID); - par2World.setBlock(0, 62 - var99, -1, Block.whiteStone.blockID); - par2World.setBlock(-1, 62 - var99, -1, Block.whiteStone.blockID); - par2World.setBlock(-1, 62 - var99, 0, Block.whiteStone.blockID); - par2World.setBlock(0, 62 - var99, 0, Block.whiteStone.blockID); - - par2World.setBlock(-1, 63 - var99, 2, Block.whiteStone.blockID); - par2World.setBlock(0, 63 - var99, 2, Block.whiteStone.blockID); - par2World.setBlock(1, 63 - var99, 2, Block.whiteStone.blockID); - par2World.setBlock(2, 63 - var99, 1, Block.whiteStone.blockID); - par2World.setBlock(2, 63 - var99, 0, Block.whiteStone.blockID); - par2World.setBlock(2, 63 - var99, -1, Block.whiteStone.blockID); - par2World.setBlock(1, 63 - var99, -2, Block.whiteStone.blockID); - par2World.setBlock(0, 63 - var99, -2, Block.whiteStone.blockID); - par2World.setBlock(-1, 63 - var99, -2, Block.whiteStone.blockID); - par2World.setBlock(-2, 63 - var99, -1, Block.whiteStone.blockID); - par2World.setBlock(-2, 63 - var99, 0, Block.whiteStone.blockID); - par2World.setBlock(-2, 63 - var99, 1, Block.whiteStone.blockID); - - par2World.setBlock(-1, 64 - var99, 2, Block.whiteStone.blockID); - par2World.setBlock(0, 64 - var99, 2, Block.whiteStone.blockID); - par2World.setBlock(1, 64 - var99, 2, Block.whiteStone.blockID); - par2World.setBlock(2, 64 - var99, 1, Block.whiteStone.blockID); - par2World.setBlock(2, 64 - var99, 0, Block.whiteStone.blockID); - par2World.setBlock(2, 64 - var99, -1, Block.whiteStone.blockID); - par2World.setBlock(1, 64 - var99, -2, Block.whiteStone.blockID); - par2World.setBlock(0, 64 - var99, -2, Block.whiteStone.blockID); - par2World.setBlock(-1, 64 - var99, -2, Block.whiteStone.blockID); - par2World.setBlock(-2, 64 - var99, -1, Block.whiteStone.blockID); - par2World.setBlock(-2, 64 - var99, 0, Block.whiteStone.blockID); - par2World.setBlock(-2, 64 - var99, 1, Block.whiteStone.blockID); - - par2World.setBlock(-1, 65 - var99, 2, Block.whiteStone.blockID); - par2World.setBlock(0, 65 - var99, 2, Block.whiteStone.blockID); - par2World.setBlock(1, 65 - var99, 2, Block.whiteStone.blockID); - par2World.setBlock(2, 65 - var99, 1, Block.whiteStone.blockID); - par2World.setBlock(2, 65 - var99, 0, Block.whiteStone.blockID); - par2World.setBlock(2, 65 - var99, -1, Block.whiteStone.blockID); - par2World.setBlock(1, 65 - var99, -2, Block.whiteStone.blockID); - par2World.setBlock(0, 65 - var99, -2, Block.whiteStone.blockID); - par2World.setBlock(-1, 65 - var99, -2, Block.whiteStone.blockID); - par2World.setBlock(-2, 65 - var99, -1, Block.whiteStone.blockID); - par2World.setBlock(-2, 65 - var99, 0, Block.whiteStone.blockID); - par2World.setBlock(-2, 65 - var99, 1, Block.whiteStone.blockID); - - par2World.setBlock(-1, 66 - var99, 1, Block.whiteStone.blockID); - par2World.setBlock(0, 66 - var99, 1, Block.whiteStone.blockID); - par2World.setBlock(1, 66 - var99, 1, Block.whiteStone.blockID); - par2World.setBlock(1, 66 - var99, 0, Block.whiteStone.blockID); - par2World.setBlock(1, 66 - var99, -1, Block.whiteStone.blockID); - par2World.setBlock(0, 66 - var99, -1, Block.whiteStone.blockID); - par2World.setBlock(-1, 66 - var99, -1, Block.whiteStone.blockID); - par2World.setBlock(-1, 66 - var99, 0, Block.whiteStone.blockID); - par2World.setBlock(0, 66 - var99, 0, Block.whiteStone.blockID); - - par2World.setBlock(-1, 63 - var99, 1, 0); - par2World.setBlock(0, 63 - var99, 1, 0); - par2World.setBlock(1, 63 - var99, 1, 0); - par2World.setBlock(1, 63 - var99, 0, 0); - par2World.setBlock(1, 63 - var99, -1, 0); - par2World.setBlock(0, 63 - var99, -1, 0); - par2World.setBlock(-1, 63 - var99, -1, 0); - par2World.setBlock(-1, 63 - var99, 0, 0); - par2World.setBlock(0, 63 - var99, 0, 0); - - par2World.setBlock(-1, 64 - var99, 1, 0); - par2World.setBlock(0, 64 - var99, 1, 0); - par2World.setBlock(1, 64 - var99, 1, 0); - par2World.setBlock(1, 64 - var99, 0, 0); - par2World.setBlock(1, 64 - var99, -1, 0); - par2World.setBlock(0, 64 - var99, -1, 0); - par2World.setBlock(-1, 64 - var99, -1, 0); - par2World.setBlock(-1, 64 - var99, 0, 0); - - par2World.setBlock(-1, 65 - var99, 1, 0); - par2World.setBlock(0, 65 - var99, 1, 0); - par2World.setBlock(1, 65 - var99, 1, 0); - par2World.setBlock(1, 65 - var99, 0, 0); - par2World.setBlock(1, 65 - var99, -1, 0); - par2World.setBlock(0, 65 - var99, -1, 0); - par2World.setBlock(-1, 65 - var99, -1, 0); - par2World.setBlock(-1, 65 - var99, 0, 0); - par2World.setBlock(0, 65 - var99, 0, 0); - - par2World.setBlock(0, 64 - var99, 0, mod_BiomesOPlenty.promisedPortal.blockID); - - par2World.setBlock(-2, 64 - var99, 2, 0); - par2World.setBlock(2, 64 - var99, 2, 0); - par2World.setBlock(2, 64 - var99, -2, 0); - par2World.setBlock(-2, 64 - var99, -2, 0); - - par2World.setBlock(-2, 65 - var99, 2, 0); - par2World.setBlock(2, 65 - var99, 2, 0); - par2World.setBlock(2, 65 - var99, -2, 0); - par2World.setBlock(-2, 65 - var99, -2, 0); - - par2World.setBlock(-2, 66 - var99, 2, 0); - par2World.setBlock(2, 66 - var99, 2, 0); - par2World.setBlock(2, 66 - var99, -2, 0); - par2World.setBlock(-2, 66 - var99, -2, 0); + + if (!par3EntityPlayer.worldObj.isRemote) + { + par3EntityPlayer.addChatMessage("\u00a75A gateway to the \u00a76\u00a7l\u00a7nPromised Land\u00a75 has been buried at the origin of this world."); + } + + int var99 = 32; + + par2World.setBlock(-1, 62 - var99, 1, Block.whiteStone.blockID); + par2World.setBlock(0, 62 - var99, 1, Block.whiteStone.blockID); + par2World.setBlock(1, 62 - var99, 1, Block.whiteStone.blockID); + par2World.setBlock(1, 62 - var99, 0, Block.whiteStone.blockID); + par2World.setBlock(1, 62 - var99, -1, Block.whiteStone.blockID); + par2World.setBlock(0, 62 - var99, -1, Block.whiteStone.blockID); + par2World.setBlock(-1, 62 - var99, -1, Block.whiteStone.blockID); + par2World.setBlock(-1, 62 - var99, 0, Block.whiteStone.blockID); + par2World.setBlock(0, 62 - var99, 0, Block.whiteStone.blockID); + + par2World.setBlock(-1, 63 - var99, 2, Block.whiteStone.blockID); + par2World.setBlock(0, 63 - var99, 2, Block.whiteStone.blockID); + par2World.setBlock(1, 63 - var99, 2, Block.whiteStone.blockID); + par2World.setBlock(2, 63 - var99, 1, Block.whiteStone.blockID); + par2World.setBlock(2, 63 - var99, 0, Block.whiteStone.blockID); + par2World.setBlock(2, 63 - var99, -1, Block.whiteStone.blockID); + par2World.setBlock(1, 63 - var99, -2, Block.whiteStone.blockID); + par2World.setBlock(0, 63 - var99, -2, Block.whiteStone.blockID); + par2World.setBlock(-1, 63 - var99, -2, Block.whiteStone.blockID); + par2World.setBlock(-2, 63 - var99, -1, Block.whiteStone.blockID); + par2World.setBlock(-2, 63 - var99, 0, Block.whiteStone.blockID); + par2World.setBlock(-2, 63 - var99, 1, Block.whiteStone.blockID); + + par2World.setBlock(-1, 64 - var99, 2, Block.whiteStone.blockID); + par2World.setBlock(0, 64 - var99, 2, Block.whiteStone.blockID); + par2World.setBlock(1, 64 - var99, 2, Block.whiteStone.blockID); + par2World.setBlock(2, 64 - var99, 1, Block.whiteStone.blockID); + par2World.setBlock(2, 64 - var99, 0, Block.whiteStone.blockID); + par2World.setBlock(2, 64 - var99, -1, Block.whiteStone.blockID); + par2World.setBlock(1, 64 - var99, -2, Block.whiteStone.blockID); + par2World.setBlock(0, 64 - var99, -2, Block.whiteStone.blockID); + par2World.setBlock(-1, 64 - var99, -2, Block.whiteStone.blockID); + par2World.setBlock(-2, 64 - var99, -1, Block.whiteStone.blockID); + par2World.setBlock(-2, 64 - var99, 0, Block.whiteStone.blockID); + par2World.setBlock(-2, 64 - var99, 1, Block.whiteStone.blockID); + + par2World.setBlock(-1, 65 - var99, 2, Block.whiteStone.blockID); + par2World.setBlock(0, 65 - var99, 2, Block.whiteStone.blockID); + par2World.setBlock(1, 65 - var99, 2, Block.whiteStone.blockID); + par2World.setBlock(2, 65 - var99, 1, Block.whiteStone.blockID); + par2World.setBlock(2, 65 - var99, 0, Block.whiteStone.blockID); + par2World.setBlock(2, 65 - var99, -1, Block.whiteStone.blockID); + par2World.setBlock(1, 65 - var99, -2, Block.whiteStone.blockID); + par2World.setBlock(0, 65 - var99, -2, Block.whiteStone.blockID); + par2World.setBlock(-1, 65 - var99, -2, Block.whiteStone.blockID); + par2World.setBlock(-2, 65 - var99, -1, Block.whiteStone.blockID); + par2World.setBlock(-2, 65 - var99, 0, Block.whiteStone.blockID); + par2World.setBlock(-2, 65 - var99, 1, Block.whiteStone.blockID); + + par2World.setBlock(-1, 66 - var99, 1, Block.whiteStone.blockID); + par2World.setBlock(0, 66 - var99, 1, Block.whiteStone.blockID); + par2World.setBlock(1, 66 - var99, 1, Block.whiteStone.blockID); + par2World.setBlock(1, 66 - var99, 0, Block.whiteStone.blockID); + par2World.setBlock(1, 66 - var99, -1, Block.whiteStone.blockID); + par2World.setBlock(0, 66 - var99, -1, Block.whiteStone.blockID); + par2World.setBlock(-1, 66 - var99, -1, Block.whiteStone.blockID); + par2World.setBlock(-1, 66 - var99, 0, Block.whiteStone.blockID); + par2World.setBlock(0, 66 - var99, 0, Block.whiteStone.blockID); + + par2World.setBlock(-1, 63 - var99, 1, 0); + par2World.setBlock(0, 63 - var99, 1, 0); + par2World.setBlock(1, 63 - var99, 1, 0); + par2World.setBlock(1, 63 - var99, 0, 0); + par2World.setBlock(1, 63 - var99, -1, 0); + par2World.setBlock(0, 63 - var99, -1, 0); + par2World.setBlock(-1, 63 - var99, -1, 0); + par2World.setBlock(-1, 63 - var99, 0, 0); + par2World.setBlock(0, 63 - var99, 0, 0); + + par2World.setBlock(-1, 64 - var99, 1, 0); + par2World.setBlock(0, 64 - var99, 1, 0); + par2World.setBlock(1, 64 - var99, 1, 0); + par2World.setBlock(1, 64 - var99, 0, 0); + par2World.setBlock(1, 64 - var99, -1, 0); + par2World.setBlock(0, 64 - var99, -1, 0); + par2World.setBlock(-1, 64 - var99, -1, 0); + par2World.setBlock(-1, 64 - var99, 0, 0); + + par2World.setBlock(-1, 65 - var99, 1, 0); + par2World.setBlock(0, 65 - var99, 1, 0); + par2World.setBlock(1, 65 - var99, 1, 0); + par2World.setBlock(1, 65 - var99, 0, 0); + par2World.setBlock(1, 65 - var99, -1, 0); + par2World.setBlock(0, 65 - var99, -1, 0); + par2World.setBlock(-1, 65 - var99, -1, 0); + par2World.setBlock(-1, 65 - var99, 0, 0); + par2World.setBlock(0, 65 - var99, 0, 0); + + par2World.setBlock(0, 64 - var99, 0, mod_BiomesOPlenty.promisedPortal.blockID); + + par2World.setBlock(-2, 64 - var99, 2, 0); + par2World.setBlock(2, 64 - var99, 2, 0); + par2World.setBlock(2, 64 - var99, -2, 0); + par2World.setBlock(-2, 64 - var99, -2, 0); + + par2World.setBlock(-2, 65 - var99, 2, 0); + par2World.setBlock(2, 65 - var99, 2, 0); + par2World.setBlock(2, 65 - var99, -2, 0); + par2World.setBlock(-2, 65 - var99, -2, 0); + + par2World.setBlock(-2, 66 - var99, 2, 0); + par2World.setBlock(2, 66 - var99, 2, 0); + par2World.setBlock(2, 66 - var99, -2, 0); + par2World.setBlock(-2, 66 - var99, -2, 0); } - + } + return par1ItemStack; } }