diff options
author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-01-15 20:16:30 +0000 |
---|---|---|
committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-01-15 20:19:10 +0000 |
commit | 2184d240db052d3679b47565c7e9c2cc5566b433 (patch) | |
tree | 812957e1f73fd96d005d57a7ee4afa1f0a4f69f8 /src/main/java/net/minecraft/server | |
parent | 5aa1bc269d22849533544af82cd0164ed1049522 (diff) | |
download | craftbukkit-2184d240db052d3679b47565c7e9c2cc5566b433.tar craftbukkit-2184d240db052d3679b47565c7e9c2cc5566b433.tar.gz craftbukkit-2184d240db052d3679b47565c7e9c2cc5566b433.tar.lz craftbukkit-2184d240db052d3679b47565c7e9c2cc5566b433.tar.xz craftbukkit-2184d240db052d3679b47565c7e9c2cc5566b433.zip |
Changed BlockFace enum to match coding standards
Diffstat (limited to 'src/main/java/net/minecraft/server')
7 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/net/minecraft/server/BlockButton.java b/src/main/java/net/minecraft/server/BlockButton.java index e17824b7..4c19f0bf 100644 --- a/src/main/java/net/minecraft/server/BlockButton.java +++ b/src/main/java/net/minecraft/server/BlockButton.java @@ -165,7 +165,7 @@ public class BlockButton extends Block { //Allow the lever to change the current int old = (j1 != 8) ? 1 : 0; int current = (j1 == 8) ? 1 : 0; - BlockRedstoneEvent bre = new BlockRedstoneEvent(block, BlockFace.Self, old, current); + BlockRedstoneEvent bre = new BlockRedstoneEvent(block, BlockFace.SELF, old, current); ((WorldServer) world).getServer().getPluginManager().callEvent(bre); if ((bre.getNewCurrent() > 0) == (j1 == 8)) { world.c(i, j, k, i1 + j1); diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java index c4fbfcf5..64bfe09d 100644 --- a/src/main/java/net/minecraft/server/BlockFlowing.java +++ b/src/main/java/net/minecraft/server/BlockFlowing.java @@ -92,7 +92,7 @@ public class BlockFlowing extends BlockFluids { CraftBlock source = (CraftBlock) ((WorldServer) world).getWorld().getBlockAt(i1, j1, k1); if (l(world, i1, j1 - 1, k1)) { // Craftbucket send "down" to the server - BlockFromToEvent blockFlow = new BlockFromToEvent(Type.BLOCK_FLOW, source, BlockFace.Down); + BlockFromToEvent blockFlow = new BlockFromToEvent(Type.BLOCK_FLOW, source, BlockFace.DOWN); ((WorldServer) world).getServer().getPluginManager().callEvent(blockFlow); if (!blockFlow.isCancelled()) { @@ -114,7 +114,7 @@ public class BlockFlowing extends BlockFluids { return; } // CraftBukkit start - all four cardinal directions. Do not change the order! - BlockFace[] faces = new BlockFace[]{ BlockFace.North, BlockFace.South, BlockFace.East, BlockFace.West }; + BlockFace[] faces = new BlockFace[]{ BlockFace.NORTH, BlockFace.SOUTH, BlockFace.EAST, BlockFace.WEST }; int index = 0; for (BlockFace currentFace: faces) { if (aflag[index]) { diff --git a/src/main/java/net/minecraft/server/BlockLever.java b/src/main/java/net/minecraft/server/BlockLever.java index a7ddac37..646c1dbc 100644 --- a/src/main/java/net/minecraft/server/BlockLever.java +++ b/src/main/java/net/minecraft/server/BlockLever.java @@ -164,7 +164,7 @@ public class BlockLever extends Block { // Craftbukkit start int old = (j1 != 8) ? 1 : 0; int current = (j1 == 8) ? 1 : 0; - BlockRedstoneEvent bre = new BlockRedstoneEvent(block, BlockFace.Self, old, current); + BlockRedstoneEvent bre = new BlockRedstoneEvent(block, BlockFace.SELF, old, current); ((WorldServer) world).getServer().getPluginManager().callEvent(bre); // Craftbukkit end diff --git a/src/main/java/net/minecraft/server/BlockPressurePlate.java b/src/main/java/net/minecraft/server/BlockPressurePlate.java index 05d24587..f96bd5f1 100644 --- a/src/main/java/net/minecraft/server/BlockPressurePlate.java +++ b/src/main/java/net/minecraft/server/BlockPressurePlate.java @@ -120,7 +120,7 @@ public class BlockPressurePlate extends Block { // Craftbukkit start CraftBlock block = (CraftBlock) ((WorldServer) world).getWorld().getBlockAt(i, j, k); - BlockRedstoneEvent bre = new BlockRedstoneEvent(block, BlockFace.Self, flag ? 15 : 0, flag1 ? 15 : 0); + BlockRedstoneEvent bre = new BlockRedstoneEvent(block, BlockFace.SELF, flag ? 15 : 0, flag1 ? 15 : 0); ((WorldServer) world).getServer().getPluginManager().callEvent(bre); flag1 = bre.getNewCurrent() > 0; // Craftbukkit end diff --git a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java index f25dde74..eccbe944 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java @@ -111,7 +111,7 @@ public class BlockRedstoneTorch extends BlockTorch { // Craftbukkit start CraftBlock block = (CraftBlock) ((WorldServer) world).getWorld().getBlockAt(i, j, k); - BlockRedstoneEvent bre = new BlockRedstoneEvent(block, BlockFace.Self, flag ? 15 : 0, flag ? 0 : 15); + BlockRedstoneEvent bre = new BlockRedstoneEvent(block, BlockFace.SELF, flag ? 15 : 0, flag ? 0 : 15); ((WorldServer) world).getServer().getPluginManager().callEvent(bre); if ((bre.getNewCurrent() != 0) == flag) { return; diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java index ffdd6954..550b8544 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java @@ -97,7 +97,7 @@ public class BlockRedstoneWire extends Block { // Craftbukkit start if (k1 != l1) { CraftBlock block = (CraftBlock) ((WorldServer) world).getWorld().getBlockAt(i, j, k); - BlockRedstoneEvent bre = new BlockRedstoneEvent(block, BlockFace.Self, k1, l1); + BlockRedstoneEvent bre = new BlockRedstoneEvent(block, BlockFace.SELF, k1, l1); ((WorldServer) world).getServer().getPluginManager().callEvent(bre); l1 = bre.getNewCurrent(); } diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java index 5458187e..32613283 100644 --- a/src/main/java/net/minecraft/server/NetServerHandler.java +++ b/src/main/java/net/minecraft/server/NetServerHandler.java @@ -385,7 +385,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener { if (blockClicked != null && itemstack != null) { blockFace = CraftBlock.notchToBlockFace(packet15place.d); } else { - blockFace = BlockFace.Self; + blockFace = BlockFace.SELF; } // CraftBukkit if rightclick decremented the item, always send the update packet. |