From a98c7ba2c706caa0ba83bddefa5ffecbe658ccd3 Mon Sep 17 00:00:00 2001 From: Erik Broes Date: Mon, 27 Jun 2011 00:25:01 +0200 Subject: Massive renaming update in nms. If you bypassed Bukkit, you will likely break. Also minimized all the nms diffs and generic cleanups all around. --- .../net/minecraft/server/BlockMinecartDetector.java | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'src/main/java/net/minecraft/server/BlockMinecartDetector.java') diff --git a/src/main/java/net/minecraft/server/BlockMinecartDetector.java b/src/main/java/net/minecraft/server/BlockMinecartDetector.java index 2df1f388..c2d629f9 100644 --- a/src/main/java/net/minecraft/server/BlockMinecartDetector.java +++ b/src/main/java/net/minecraft/server/BlockMinecartDetector.java @@ -3,16 +3,7 @@ package net.minecraft.server; import java.util.List; import java.util.Random; -// CraftBukkit start -import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.CraftWorld; -import org.bukkit.craftbukkit.block.CraftBlock; -import org.bukkit.craftbukkit.event.CraftEventFactory; -import org.bukkit.event.Cancellable; -import org.bukkit.event.block.Action; -import org.bukkit.event.block.BlockRedstoneEvent; -// CraftBukkit end +import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit public class BlockMinecartDetector extends BlockMinecartTrack { @@ -69,12 +60,10 @@ public class BlockMinecartDetector extends BlockMinecartTrack { // CraftBukkit start if (flag != flag1) { - CraftServer server = world.getServer(); - CraftWorld craftWorld = world.getWorld(); - CraftBlock block = (CraftBlock) craftWorld.getBlockAt(i, j, k); + org.bukkit.block.Block block = world.getWorld().getBlockAt(i, j, k); BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(block, flag ? 1 : 0, flag1 ? 1 : 0); - server.getPluginManager().callEvent(eventRedstone); + world.getServer().getPluginManager().callEvent(eventRedstone); flag1 = eventRedstone.getNewCurrent() > 0; } -- cgit v1.2.3