From 3418f8d7a1597cd2aabad7e43ba39ab5151d3c66 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 22 Aug 2018 08:52:17 +1000 Subject: SPIGOT-4298: Block command sender returns wrong block --- .../bukkit/craftbukkit/command/CraftBlockCommandSender.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/main') diff --git a/src/main/java/org/bukkit/craftbukkit/command/CraftBlockCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/CraftBlockCommandSender.java index 3ad7dfdb..701a57e0 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/CraftBlockCommandSender.java +++ b/src/main/java/org/bukkit/craftbukkit/command/CraftBlockCommandSender.java @@ -1,13 +1,12 @@ package org.bukkit.craftbukkit.command; -import net.minecraft.server.CommandBlockListenerAbstract; import net.minecraft.server.CommandListenerWrapper; -import net.minecraft.server.ICommandListener; import net.minecraft.server.IChatBaseComponent; -import net.minecraft.server.Vec3D; +import net.minecraft.server.TileEntity; import org.bukkit.block.Block; import org.bukkit.command.BlockCommandSender; +import org.bukkit.craftbukkit.block.CraftBlock; import org.bukkit.craftbukkit.util.CraftChatMessage; /** @@ -15,15 +14,16 @@ import org.bukkit.craftbukkit.util.CraftChatMessage; */ public class CraftBlockCommandSender extends ServerCommandSender implements BlockCommandSender { private final CommandListenerWrapper block; + private final TileEntity tile; - public CraftBlockCommandSender(CommandListenerWrapper commandBlockListenerAbstract) { + public CraftBlockCommandSender(CommandListenerWrapper commandBlockListenerAbstract, TileEntity tile) { super(); this.block = commandBlockListenerAbstract; + this.tile = tile; } public Block getBlock() { - Vec3D pos = block.getPosition(); - return block.getWorld().getWorld().getBlockAt((int) pos.x, (int) pos.y, (int) pos.z); + return CraftBlock.at(tile.getWorld(), tile.getPosition()); } public void sendMessage(String message) { -- cgit v1.2.3