Use valid item for enchantment checks on block
This commit is contained in:
FatSaw
@@ -0,0 +1,568 @@
|
||||
package net.minecraft.server;
|
||||
|
||||
// CraftBukkit start
|
||||
import java.util.ArrayList;
|
||||
import org.bukkit.event.block.BlockBreakEvent;
|
||||
import org.bukkit.craftbukkit.event.CraftEventFactory;
|
||||
import org.bukkit.event.Event;
|
||||
import org.bukkit.event.block.Action;
|
||||
import org.bukkit.event.player.PlayerInteractEvent;
|
||||
// CraftBukkit end
|
||||
|
||||
public class PlayerInteractManager {
|
||||
|
||||
public World world;
|
||||
public EntityPlayer player;
|
||||
private EnumGamemode gamemode;
|
||||
private boolean d;
|
||||
private int lastDigTick;
|
||||
private BlockPosition f;
|
||||
private int currentTick;
|
||||
private boolean h;
|
||||
private BlockPosition i;
|
||||
private int j;
|
||||
private int k;
|
||||
|
||||
public PlayerInteractManager(World world) {
|
||||
this.gamemode = EnumGamemode.NOT_SET;
|
||||
this.f = BlockPosition.ZERO;
|
||||
this.i = BlockPosition.ZERO;
|
||||
this.k = -1;
|
||||
this.world = world;
|
||||
}
|
||||
|
||||
public void setGameMode(EnumGamemode enumgamemode) {
|
||||
this.gamemode = enumgamemode;
|
||||
enumgamemode.a(this.player.abilities);
|
||||
this.player.updateAbilities();
|
||||
this.player.server.getPlayerList().sendAll(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.UPDATE_GAME_MODE, new EntityPlayer[] { this.player}), this.player); // CraftBukkit
|
||||
this.world.everyoneSleeping();
|
||||
}
|
||||
|
||||
public EnumGamemode getGameMode() {
|
||||
return this.gamemode;
|
||||
}
|
||||
|
||||
public boolean c() {
|
||||
return this.gamemode.e();
|
||||
}
|
||||
|
||||
public boolean isCreative() {
|
||||
return this.gamemode.isCreative();
|
||||
}
|
||||
|
||||
public void b(EnumGamemode enumgamemode) {
|
||||
if (this.gamemode == EnumGamemode.NOT_SET) {
|
||||
this.gamemode = enumgamemode;
|
||||
}
|
||||
|
||||
this.setGameMode(this.gamemode);
|
||||
}
|
||||
|
||||
public void a() {
|
||||
this.currentTick = MinecraftServer.currentTick; // CraftBukkit;
|
||||
float f;
|
||||
int i;
|
||||
|
||||
if (this.h) {
|
||||
int j = this.currentTick - this.j;
|
||||
IBlockData iblockdata = this.world.getType(this.i);
|
||||
|
||||
if (iblockdata.getMaterial() == Material.AIR) {
|
||||
this.h = false;
|
||||
} else {
|
||||
f = iblockdata.a((EntityHuman) this.player, this.player.world, this.i) * (float) (j + 1);
|
||||
i = (int) (f * 10.0F);
|
||||
if (i != this.k) {
|
||||
this.world.c(this.player.getId(), this.i, i);
|
||||
this.k = i;
|
||||
}
|
||||
|
||||
if (f >= 1.0F) {
|
||||
this.h = false;
|
||||
this.breakBlock(this.i);
|
||||
}
|
||||
}
|
||||
} else if (this.d) {
|
||||
IBlockData iblockdata1 = this.world.getType(this.f);
|
||||
|
||||
if (iblockdata1.getMaterial() == Material.AIR) {
|
||||
this.world.c(this.player.getId(), this.f, -1);
|
||||
this.k = -1;
|
||||
this.d = false;
|
||||
} else {
|
||||
int k = this.currentTick - this.lastDigTick;
|
||||
|
||||
f = iblockdata1.a((EntityHuman) this.player, this.player.world, this.i) * (float) (k + 1);
|
||||
i = (int) (f * 10.0F);
|
||||
if (i != this.k) {
|
||||
this.world.c(this.player.getId(), this.f, i);
|
||||
this.k = i;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void a(BlockPosition blockposition, EnumDirection enumdirection) {
|
||||
// CraftBukkit start
|
||||
PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(this.player, Action.LEFT_CLICK_BLOCK, blockposition, enumdirection, this.player.inventory.getItemInHand(), EnumHand.MAIN_HAND);
|
||||
if (event.isCancelled()) {
|
||||
// Let the client know the block still exists
|
||||
((EntityPlayer) this.player).playerConnection.sendPacket(new PacketPlayOutBlockChange(this.world, blockposition));
|
||||
cancelBreakBlock(blockposition, this.world.getType(blockposition)); // Paper - Avoid visual issues on the client
|
||||
// Update any tile entity data for this block
|
||||
TileEntity tileentity = this.world.getTileEntity(blockposition);
|
||||
if (tileentity != null) {
|
||||
this.player.playerConnection.sendPacket(tileentity.getUpdatePacket());
|
||||
}
|
||||
return;
|
||||
}
|
||||
// CraftBukkit end
|
||||
if (this.isCreative()) {
|
||||
if (!this.world.douseFire((EntityHuman) null, blockposition, enumdirection)) {
|
||||
this.breakBlock(blockposition);
|
||||
}
|
||||
|
||||
} else {
|
||||
IBlockData iblockdata = this.world.getType(blockposition);
|
||||
Block block = iblockdata.getBlock();
|
||||
|
||||
if (this.gamemode.c()) {
|
||||
if (this.gamemode == EnumGamemode.SPECTATOR) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!this.player.dk()) {
|
||||
ItemStack itemstack = this.player.getItemInMainHand();
|
||||
|
||||
if (itemstack.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!itemstack.a(block)) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// this.world.douseFire((EntityHuman) null, blockposition, enumdirection); // CraftBukkit - Moved down
|
||||
this.lastDigTick = this.currentTick;
|
||||
float f = 1.0F;
|
||||
|
||||
// CraftBukkit start - Swings at air do *NOT* exist.
|
||||
if (event.useInteractedBlock() == Event.Result.DENY) {
|
||||
// If we denied a door from opening, we need to send a correcting update to the client, as it already opened the door.
|
||||
IBlockData data = this.world.getType(blockposition);
|
||||
if (block == Blocks.WOODEN_DOOR) {
|
||||
// For some reason *BOTH* the bottom/top part have to be marked updated.
|
||||
boolean bottom = data.get(BlockDoor.HALF) == BlockDoor.EnumDoorHalf.LOWER;
|
||||
((EntityPlayer) this.player).playerConnection.sendPacket(new PacketPlayOutBlockChange(this.world, blockposition));
|
||||
((EntityPlayer) this.player).playerConnection.sendPacket(new PacketPlayOutBlockChange(this.world, bottom ? blockposition.up() : blockposition.down()));
|
||||
} else if (block == Blocks.TRAPDOOR) {
|
||||
((EntityPlayer) this.player).playerConnection.sendPacket(new PacketPlayOutBlockChange(this.world, blockposition));
|
||||
}
|
||||
} else if (iblockdata.getMaterial() != Material.AIR) {
|
||||
block.attack(this.world, blockposition, this.player);
|
||||
f = iblockdata.a((EntityHuman) this.player, this.player.world, blockposition);
|
||||
// Allow fire punching to be blocked
|
||||
this.world.douseFire((EntityHuman) null, blockposition, enumdirection);
|
||||
}
|
||||
|
||||
if (event.useItemInHand() == Event.Result.DENY) {
|
||||
// If we 'insta destroyed' then the client needs to be informed.
|
||||
if (f > 1.0f) {
|
||||
((EntityPlayer) this.player).playerConnection.sendPacket(new PacketPlayOutBlockChange(this.world, blockposition));
|
||||
}
|
||||
return;
|
||||
}
|
||||
org.bukkit.event.block.BlockDamageEvent blockEvent = CraftEventFactory.callBlockDamageEvent(this.player, blockposition.getX(), blockposition.getY(), blockposition.getZ(), this.player.inventory.getItemInHand(), f >= 1.0f);
|
||||
|
||||
if (blockEvent.isCancelled()) {
|
||||
// Let the client know the block still exists
|
||||
((EntityPlayer) this.player).playerConnection.sendPacket(new PacketPlayOutBlockChange(this.world, blockposition));
|
||||
return;
|
||||
}
|
||||
|
||||
if (blockEvent.getInstaBreak()) {
|
||||
f = 2.0f;
|
||||
}
|
||||
// CraftBukkit end
|
||||
|
||||
if (iblockdata.getMaterial() != Material.AIR && f >= 1.0F) {
|
||||
this.breakBlock(blockposition);
|
||||
} else {
|
||||
this.d = true;
|
||||
this.f = blockposition;
|
||||
int i = (int) (f * 10.0F);
|
||||
|
||||
this.world.c(this.player.getId(), blockposition, i);
|
||||
this.player.playerConnection.sendPacket(new PacketPlayOutBlockChange(world, blockposition)); // Paper - MC-54026 - backport from 1.13
|
||||
this.k = i;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
this.world.chunkPacketBlockController.updateNearbyBlocks(this.world, blockposition); // Paper - Anti-Xray
|
||||
}
|
||||
|
||||
public void a(BlockPosition blockposition) {
|
||||
if (blockposition.equals(this.f)) {
|
||||
this.currentTick = MinecraftServer.currentTick; // CraftBukkit
|
||||
int i = this.currentTick - this.lastDigTick;
|
||||
IBlockData iblockdata = this.world.getType(blockposition);
|
||||
|
||||
if (iblockdata.getMaterial() != Material.AIR) {
|
||||
float f = iblockdata.a((EntityHuman) this.player, this.player.world, blockposition) * (float) (i + 1);
|
||||
|
||||
if (f >= 0.7F) {
|
||||
this.d = false;
|
||||
this.world.c(this.player.getId(), blockposition, -1);
|
||||
this.breakBlock(blockposition);
|
||||
} else if (!this.h) {
|
||||
this.d = false;
|
||||
this.h = true;
|
||||
this.i = blockposition;
|
||||
this.j = this.lastDigTick;
|
||||
}
|
||||
}
|
||||
// CraftBukkit start - Force block reset to client
|
||||
} else {
|
||||
this.player.playerConnection.sendPacket(new PacketPlayOutBlockChange(this.world, blockposition));
|
||||
// CraftBukkit end
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void e() {
|
||||
this.d = false;
|
||||
this.world.c(this.player.getId(), this.f, -1);
|
||||
}
|
||||
|
||||
private boolean c(BlockPosition blockposition) {
|
||||
IBlockData iblockdata = this.world.getType(blockposition);
|
||||
|
||||
iblockdata.getBlock().a(this.world, blockposition, iblockdata, (EntityHuman) this.player);
|
||||
boolean flag = this.world.setAir(blockposition);
|
||||
|
||||
if (flag) {
|
||||
iblockdata.getBlock().postBreak(this.world, blockposition, iblockdata);
|
||||
}
|
||||
|
||||
return flag;
|
||||
}
|
||||
|
||||
// Paper start - Extra method to avoid visual issues on the client when cancelling block breaks
|
||||
private void cancelBreakBlock(BlockPosition position, IBlockData data) {
|
||||
Block block = data.getBlock();
|
||||
// Send other half of the door
|
||||
if (block instanceof BlockDoor) {
|
||||
boolean bottom = data.get(BlockDoor.HALF) == BlockDoor.EnumDoorHalf.LOWER;
|
||||
this.player.playerConnection.sendPacket(new PacketPlayOutBlockChange(world, bottom ? position.up() : position.down()));
|
||||
} else if (block instanceof BlockTallPlant) {
|
||||
boolean bottom = data.get(BlockTallPlant.HALF) == BlockTallPlant.EnumTallPlantHalf.LOWER;
|
||||
this.player.playerConnection.sendPacket(new PacketPlayOutBlockChange(world, bottom ? position.up() : position.down()));
|
||||
} else if (block instanceof BlockPistonExtension) {
|
||||
BlockPosition piston = position.shift(data.get(BlockPistonExtension.FACING).opposite());
|
||||
this.player.playerConnection.sendPacket(new PacketPlayOutBlockChange(world, piston));
|
||||
} else if (block instanceof BlockBed) {
|
||||
if (data.get(BlockBed.PART) == BlockBed.EnumBedPart.FOOT) {
|
||||
// Restore head of bed
|
||||
BlockPosition head = position.shift(data.get(BlockBed.FACING));
|
||||
this.player.playerConnection.sendPacket(new PacketPlayOutBlockChange(world, head));
|
||||
|
||||
TileEntity tileentity = this.world.getTileEntity(head);
|
||||
if (tileentity != null) {
|
||||
this.player.playerConnection.sendPacket(tileentity.getUpdatePacket());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// Paper end
|
||||
|
||||
public boolean breakBlock(BlockPosition blockposition) {
|
||||
// CraftBukkit start - fire BlockBreakEvent
|
||||
BlockBreakEvent event = null;
|
||||
|
||||
if (this.player instanceof EntityPlayer) {
|
||||
org.bukkit.block.Block block = this.world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
||||
|
||||
// Sword + Creative mode pre-cancel
|
||||
boolean isSwordNoBreak = this.gamemode.isCreative() && !this.player.getItemInMainHand().isEmpty() && this.player.getItemInMainHand().getItem() instanceof ItemSword;
|
||||
|
||||
// Tell client the block is gone immediately then process events
|
||||
// Don't tell the client if its a creative sword break because its not broken!
|
||||
if (world.getTileEntity(blockposition) == null && !isSwordNoBreak) {
|
||||
PacketPlayOutBlockChange packet = new PacketPlayOutBlockChange(this.world, blockposition);
|
||||
packet.block = Blocks.AIR.getBlockData();
|
||||
((EntityPlayer) this.player).playerConnection.sendPacket(packet);
|
||||
}
|
||||
|
||||
event = new BlockBreakEvent(block, this.player.getBukkitEntity());
|
||||
|
||||
// Sword + Creative mode pre-cancel
|
||||
event.setCancelled(isSwordNoBreak);
|
||||
|
||||
// Calculate default block experience
|
||||
IBlockData nmsData = this.world.getType(blockposition);
|
||||
Block nmsBlock = nmsData.getBlock();
|
||||
|
||||
ItemStack itemstack = this.player.getEquipment(EnumItemSlot.MAINHAND);
|
||||
|
||||
if (nmsBlock != null && !event.isCancelled() && !this.isCreative() && this.player.hasBlock(nmsBlock.getBlockData())) {
|
||||
// Copied from block.a(World world, EntityHuman entityhuman, BlockPosition blockposition, IBlockData iblockdata, @Nullable TileEntity tileentity, ItemStack itemstack)
|
||||
// PAIL: checkme each update
|
||||
if (!(nmsBlock.o() && EnchantmentManager.getEnchantmentLevel(Enchantments.SILK_TOUCH, itemstack) > 0)) {
|
||||
int bonusLevel = EnchantmentManager.getEnchantmentLevel(Enchantments.LOOT_BONUS_BLOCKS, itemstack);
|
||||
|
||||
event.setExpToDrop(nmsBlock.getExpDrop(this.world, nmsData, bonusLevel));
|
||||
}
|
||||
}
|
||||
|
||||
this.world.getServer().getPluginManager().callEvent(event);
|
||||
|
||||
if (event.isCancelled()) {
|
||||
if (isSwordNoBreak) {
|
||||
return false;
|
||||
}
|
||||
// Let the client know the block still exists
|
||||
((EntityPlayer) this.player).playerConnection.sendPacket(new PacketPlayOutBlockChange(this.world, blockposition));
|
||||
cancelBreakBlock(blockposition, nmsData); // Paper - Move cancellation code to extra "cancelBreakBlock" method
|
||||
// Update any tile entity data for this block
|
||||
TileEntity tileentity = this.world.getTileEntity(blockposition);
|
||||
if (tileentity != null) {
|
||||
this.player.playerConnection.sendPacket(tileentity.getUpdatePacket());
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
if (false && this.gamemode.isCreative() && !this.player.getItemInMainHand().isEmpty() && this.player.getItemInMainHand().getItem() instanceof ItemSword) { // CraftBukkit - false
|
||||
return false;
|
||||
} else {
|
||||
IBlockData iblockdata = this.world.getType(blockposition);
|
||||
if (iblockdata.getBlock() == Blocks.AIR) return false; // CraftBukkit - A plugin set block to air without cancelling
|
||||
TileEntity tileentity = this.world.getTileEntity(blockposition);
|
||||
Block block = iblockdata.getBlock();
|
||||
|
||||
// CraftBukkit start - Special case skulls, their item data comes from a tile entity (Also check if block should drop items)
|
||||
if (iblockdata.getBlock() == Blocks.SKULL && !this.isCreative() && event.isDropItems()) {
|
||||
iblockdata.getBlock().dropNaturally(world, blockposition, iblockdata, 1.0F, 0);
|
||||
return this.c(blockposition);
|
||||
}
|
||||
|
||||
// And shulker boxes too for duplication on cancel reasons (Also check if block should drop items)
|
||||
if (iblockdata.getBlock() instanceof BlockShulkerBox && event.isDropItems()) {
|
||||
iblockdata.getBlock().dropNaturally(world, blockposition, iblockdata, 1.0F, 0);
|
||||
return this.c(blockposition);
|
||||
}
|
||||
// CraftBukkit end
|
||||
|
||||
if ((block instanceof BlockCommand || block instanceof BlockStructure) && !this.player.isCreativeAndOp()) {
|
||||
this.world.notify(blockposition, iblockdata, iblockdata, 3);
|
||||
return false;
|
||||
} else {
|
||||
if (this.gamemode.c()) {
|
||||
if (this.gamemode == EnumGamemode.SPECTATOR) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!this.player.dk()) {
|
||||
ItemStack itemstack = this.player.getItemInMainHand();
|
||||
|
||||
if (itemstack.isEmpty()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!itemstack.a(block)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
this.world.a(this.player, 2001, blockposition, Block.getCombinedId(iblockdata));
|
||||
// CraftBukkit start
|
||||
world.captureDrops = new ArrayList<>();
|
||||
boolean flag = this.c(blockposition);
|
||||
if (event.isDropItems()) {
|
||||
for (EntityItem item : world.captureDrops) {
|
||||
world.addEntity(item);
|
||||
}
|
||||
}
|
||||
world.captureDrops = null;
|
||||
// CraftBukkit end
|
||||
|
||||
if (this.isCreative()) {
|
||||
this.player.playerConnection.sendPacket(new PacketPlayOutBlockChange(this.world, blockposition));
|
||||
} else {
|
||||
ItemStack itemstack1 = this.player.getItemInMainHand();
|
||||
//ItemStack itemstack2 = itemstack1.isEmpty() ? ItemStack.a : itemstack1.cloneItemStack(); //NeonPaper move up
|
||||
boolean flag1 = this.player.hasBlock(iblockdata);
|
||||
ItemStack itemstack2 = flag && flag1 && event.isDropItems() && !itemstack1.isEmpty() ? itemstack1.cloneItemStack() : ItemStack.a; // NeonPaper - clone before use
|
||||
|
||||
if (!itemstack1.isEmpty()) {
|
||||
itemstack1.a(this.world, iblockdata, blockposition, this.player);
|
||||
}
|
||||
|
||||
// CraftBukkit start - Check if block should drop items
|
||||
if (flag && flag1 && event.isDropItems()) {
|
||||
iblockdata.getBlock().a(this.world, this.player, blockposition, iblockdata, tileentity, itemstack2);
|
||||
}
|
||||
// CraftBukkit end
|
||||
}
|
||||
|
||||
// CraftBukkit start - Drop event experience
|
||||
if (flag && event != null) {
|
||||
iblockdata.getBlock().dropExperience(this.world, blockposition, event.getExpToDrop(), this.player); // Paper
|
||||
}
|
||||
// CraftBukkit end
|
||||
|
||||
return flag;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public EnumInteractionResult a(EntityHuman entityhuman, World world, ItemStack itemstack, EnumHand enumhand) {
|
||||
if (this.gamemode == EnumGamemode.SPECTATOR) {
|
||||
return EnumInteractionResult.PASS;
|
||||
} else if (entityhuman.getCooldownTracker().a(itemstack.getItem())) {
|
||||
return EnumInteractionResult.PASS;
|
||||
} else {
|
||||
int i = itemstack.getCount();
|
||||
int j = itemstack.getData();
|
||||
InteractionResultWrapper interactionresultwrapper = itemstack.a(world, entityhuman, enumhand);
|
||||
ItemStack itemstack1 = (ItemStack) interactionresultwrapper.b();
|
||||
|
||||
if (itemstack1 == itemstack && itemstack1.getCount() == i && itemstack1.m() <= 0 && itemstack1.getData() == j) {
|
||||
return interactionresultwrapper.a();
|
||||
} else if (interactionresultwrapper.a() == EnumInteractionResult.FAIL && itemstack1.m() > 0 && !entityhuman.isHandRaised()) {
|
||||
return interactionresultwrapper.a();
|
||||
} else {
|
||||
entityhuman.a(enumhand, itemstack1);
|
||||
if (this.isCreative()) {
|
||||
itemstack1.setCount(i);
|
||||
if (itemstack1.f()) {
|
||||
itemstack1.setData(j);
|
||||
}
|
||||
}
|
||||
|
||||
if (itemstack1.isEmpty()) {
|
||||
entityhuman.a(enumhand, ItemStack.a);
|
||||
}
|
||||
|
||||
if (!entityhuman.isHandRaised()) {
|
||||
((EntityPlayer) entityhuman).updateInventory(entityhuman.defaultContainer);
|
||||
}
|
||||
|
||||
return interactionresultwrapper.a();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// CraftBukkit start - whole method
|
||||
public boolean interactResult = false;
|
||||
public boolean firedInteract = false;
|
||||
public EnumInteractionResult a(EntityHuman entityhuman, World world, ItemStack itemstack, EnumHand enumhand, BlockPosition blockposition, EnumDirection enumdirection, float f, float f1, float f2) {
|
||||
IBlockData blockdata = world.getType(blockposition);
|
||||
EnumInteractionResult enuminteractionresult = EnumInteractionResult.FAIL;
|
||||
if (blockdata.getBlock() != Blocks.AIR) {
|
||||
boolean cancelledBlock = false;
|
||||
|
||||
if (this.gamemode == EnumGamemode.SPECTATOR) {
|
||||
TileEntity tileentity = world.getTileEntity(blockposition);
|
||||
cancelledBlock = !(tileentity instanceof ITileInventory || tileentity instanceof IInventory);
|
||||
}
|
||||
|
||||
if (entityhuman.getCooldownTracker().a(itemstack.getItem())) {
|
||||
cancelledBlock = true;
|
||||
}
|
||||
|
||||
if (itemstack.getItem() instanceof ItemBlock && !entityhuman.isCreativeAndOp()) {
|
||||
Block block1 = ((ItemBlock) itemstack.getItem()).getBlock();
|
||||
|
||||
if (block1 instanceof BlockCommand || block1 instanceof BlockStructure) {
|
||||
cancelledBlock = true;
|
||||
}
|
||||
}
|
||||
|
||||
PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(entityhuman, Action.RIGHT_CLICK_BLOCK, blockposition, enumdirection, itemstack, cancelledBlock, enumhand);
|
||||
firedInteract = true;
|
||||
interactResult = event.useItemInHand() == Event.Result.DENY;
|
||||
|
||||
if (event.useInteractedBlock() == Event.Result.DENY) {
|
||||
// If we denied a door from opening, we need to send a correcting update to the client, as it already opened the door.
|
||||
if (blockdata.getBlock() instanceof BlockDoor) {
|
||||
boolean bottom = blockdata.get(BlockDoor.HALF) == BlockDoor.EnumDoorHalf.LOWER;
|
||||
((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, bottom ? blockposition.up() : blockposition.down()));
|
||||
} else if (blockdata.getBlock() instanceof BlockCake) {
|
||||
((EntityPlayer) entityhuman).getBukkitEntity().sendHealthUpdate(); // SPIGOT-1341 - reset health for cake
|
||||
// Paper start - extend Player Interact cancellation
|
||||
} else if (blockdata.getBlock() instanceof BlockStructure) {
|
||||
((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutCloseWindow());
|
||||
} else if (blockdata.getBlock() instanceof BlockCommand) {
|
||||
((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutCloseWindow());
|
||||
} else if (blockdata.getBlock() instanceof BlockFlowerPot) {
|
||||
// Send a block change to air and then send back the correct block, just to make the client happy
|
||||
PacketPlayOutBlockChange packet = new PacketPlayOutBlockChange(this.world, blockposition);
|
||||
packet.block = Blocks.AIR.getBlockData();
|
||||
this.player.playerConnection.sendPacket(packet);
|
||||
|
||||
this.player.playerConnection.sendPacket(new PacketPlayOutBlockChange(this.world, blockposition));
|
||||
|
||||
TileEntity tileentity = this.world.getTileEntity(blockposition);
|
||||
if (tileentity != null) {
|
||||
player.playerConnection.sendPacket(tileentity.getUpdatePacket());
|
||||
}
|
||||
// Paper end - extend Player Interact cancellation
|
||||
}
|
||||
((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-2867
|
||||
enuminteractionresult = (event.useItemInHand() != Event.Result.ALLOW) ? EnumInteractionResult.SUCCESS : EnumInteractionResult.PASS;
|
||||
} else if (this.gamemode == EnumGamemode.SPECTATOR) {
|
||||
TileEntity tileentity = world.getTileEntity(blockposition);
|
||||
|
||||
if (tileentity instanceof ITileInventory) {
|
||||
Block block = world.getType(blockposition).getBlock();
|
||||
ITileInventory itileinventory = (ITileInventory) tileentity;
|
||||
|
||||
if (itileinventory instanceof TileEntityChest && block instanceof BlockChest) {
|
||||
itileinventory = ((BlockChest) block).getInventory(world, blockposition);
|
||||
}
|
||||
|
||||
if (itileinventory != null) {
|
||||
entityhuman.openContainer(itileinventory);
|
||||
return EnumInteractionResult.SUCCESS;
|
||||
}
|
||||
} else if (tileentity instanceof IInventory) {
|
||||
entityhuman.openContainer((IInventory) tileentity);
|
||||
return EnumInteractionResult.SUCCESS;
|
||||
}
|
||||
|
||||
return EnumInteractionResult.PASS;
|
||||
} else {
|
||||
if (!entityhuman.isSneaking() || entityhuman.getItemInMainHand().isEmpty() && entityhuman.getItemInOffHand().isEmpty()) {
|
||||
IBlockData iblockdata = world.getType(blockposition);
|
||||
|
||||
enuminteractionresult = iblockdata.getBlock().interact(world, blockposition, iblockdata, entityhuman, enumhand, enumdirection, f, f1, f2) ? EnumInteractionResult.SUCCESS : EnumInteractionResult.PASS;
|
||||
}
|
||||
}
|
||||
|
||||
if (!itemstack.isEmpty() && enuminteractionresult != EnumInteractionResult.SUCCESS && !interactResult) { // add !interactResult SPIGOT-764
|
||||
int i = itemstack.getData();
|
||||
int j = itemstack.getCount();
|
||||
|
||||
enuminteractionresult = itemstack.placeItem(entityhuman, world, blockposition, enumhand, enumdirection, f, f1, f2);
|
||||
|
||||
// The item count should not decrement in Creative mode.
|
||||
if (this.isCreative()) {
|
||||
itemstack.setData(i);
|
||||
itemstack.setCount(j);
|
||||
}
|
||||
}
|
||||
}
|
||||
return enuminteractionresult;
|
||||
// CraftBukkit end
|
||||
}
|
||||
|
||||
public void a(WorldServer worldserver) {
|
||||
this.world = worldserver;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user