diff options
| author | Erik Broes <erikbroes@grum.nl> | 2011-06-27 00:25:01 +0200 |
|---|---|---|
| committer | Erik Broes <erikbroes@grum.nl> | 2011-06-27 00:47:03 +0200 |
| commit | a98c7ba2c706caa0ba83bddefa5ffecbe658ccd3 (patch) | |
| tree | f7c9c5db09b72b57a85240cc7fdb2e4bcf7ab875 /src/main/java/net/minecraft/server/BlockDoor.java | |
| parent | 9e5dba8306f77e0583537efe7d5b3670639e3382 (diff) | |
| download | craftbukkit-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/BlockDoor.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/BlockDoor.java | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/main/java/net/minecraft/server/BlockDoor.java b/src/main/java/net/minecraft/server/BlockDoor.java index 914a80c3..4b2162a5 100644 --- a/src/main/java/net/minecraft/server/BlockDoor.java +++ b/src/main/java/net/minecraft/server/BlockDoor.java @@ -2,11 +2,7 @@ package net.minecraft.server; import java.util.Random; -// CraftBukkit start -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.CraftWorld; -import org.bukkit.event.block.BlockRedstoneEvent; -// CraftBukkit end +import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit public class BlockDoor extends Block { @@ -170,16 +166,16 @@ public class BlockDoor extends Block { boolean flag1 = world.isBlockIndirectlyPowered(i, j, k) || world.isBlockIndirectlyPowered(i, j + 1, k); // CraftBukkit start - CraftWorld craftWorld = ((WorldServer) world).getWorld(); - CraftServer server = ((WorldServer) world).getServer(); - org.bukkit.block.Block block = craftWorld.getBlockAt(i, j, k); - org.bukkit.block.Block blockTop = craftWorld.getBlockAt(i, j + 1, k); + org.bukkit.World bworld = world.getWorld(); + org.bukkit.block.Block block = bworld.getBlockAt(i, j, k); + org.bukkit.block.Block blockTop = bworld.getBlockAt(i, j + 1, k); + int power = block.getBlockPower(); int powerTop = blockTop.getBlockPower(); if (powerTop > power) power = powerTop; - BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(block, (world.getData(i, j, k) & 4) > 0 ? 15 : 0, power); - server.getPluginManager().callEvent(eventRedstone); + BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(block, (world.getData(i, j, k) & 4) > 0 ? 15 : 0, power); + world.getServer().getPluginManager().callEvent(eventRedstone); flag1 = eventRedstone.getNewCurrent() > 0; // CraftBukkit end |