summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/ItemBlock.java
diff options
context:
space:
mode:
authorErik Broes <erikbroes@grum.nl>2011-06-27 00:25:01 +0200
committerErik Broes <erikbroes@grum.nl>2011-06-27 00:47:03 +0200
commita98c7ba2c706caa0ba83bddefa5ffecbe658ccd3 (patch)
treef7c9c5db09b72b57a85240cc7fdb2e4bcf7ab875 /src/main/java/net/minecraft/server/ItemBlock.java
parent9e5dba8306f77e0583537efe7d5b3670639e3382 (diff)
downloadcraftbukkit-a98c7ba2c706caa0ba83bddefa5ffecbe658ccd3.tar
craftbukkit-a98c7ba2c706caa0ba83bddefa5ffecbe658ccd3.tar.gz
craftbukkit-a98c7ba2c706caa0ba83bddefa5ffecbe658ccd3.tar.lz
craftbukkit-a98c7ba2c706caa0ba83bddefa5ffecbe658ccd3.tar.xz
craftbukkit-a98c7ba2c706caa0ba83bddefa5ffecbe658ccd3.zip
Massive renaming update in nms. If you bypassed Bukkit, you will likely break.
Also minimized all the nms diffs and generic cleanups all around.
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemBlock.java')
-rw-r--r--src/main/java/net/minecraft/server/ItemBlock.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
index dbd2d6af..64e301be 100644
--- a/src/main/java/net/minecraft/server/ItemBlock.java
+++ b/src/main/java/net/minecraft/server/ItemBlock.java
@@ -1,7 +1,6 @@
package net.minecraft.server;
// CraftBukkit start
-import org.bukkit.block.BlockState;
import org.bukkit.craftbukkit.block.CraftBlockState;
import org.bukkit.craftbukkit.event.CraftEventFactory;
import org.bukkit.event.block.BlockPlaceEvent;
@@ -56,13 +55,13 @@ public class ItemBlock extends Item {
Block block = Block.byId[this.id];
// CraftBukkit start - This executes the placement of the block
- BlockState replacedBlockState = CraftBlockState.getBlockState(world, i, j, k);
+ CraftBlockState replacedBlockState = CraftBlockState.getBlockState(world, i, j, k);
// There are like 30 combinations you can mix and match steps and double steps
// of different materials, so there are a lot of different cases of what
// would happen if you place x step onto another y step, so let's just keep
// track of the entire state
- BlockState blockStateBelow = null;
+ CraftBlockState blockStateBelow = null;
if ((world.getTypeId(i, j - 1, k) == Block.STEP.id || world.getTypeId(i, j - 1, k) == Block.DOUBLE_STEP.id)
&& (itemstack.id == Block.DOUBLE_STEP.id || itemstack.id == Block.STEP.id)) {
blockStateBelow = CraftBlockState.getBlockState(world, i, j - 1, k);