Update to Minecraft 1.8

For more information please see http://www.spigotmc.org/

1 files changed, 289 insertions, 0 deletions

diff --git a/nms-patches/PlayerInteractManager.patch b/nms-patches/PlayerInteractManager.patch
new file mode 100644
index 00000000..ac0ab569
--- /dev/null
+++ b/nms-patches/PlayerInteractManager.patch
@@ -0,0 +1,289 @@
+--- ../work/decompile-bb26c12b/net/minecraft/server/PlayerInteractManager.java	2014-11-27 08:59:46.857421159 +1100
++++ src/main/java/net/minecraft/server/PlayerInteractManager.java	2014-11-27 08:42:10.108850996 +1100
+@@ -1,5 +1,13 @@
+ package net.minecraft.server;
+ 
++// CraftBukkit start
++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;
+@@ -50,7 +58,7 @@
+     }
+ 
+     public void a() {
+-        ++this.currentTick;
++        this.currentTick = MinecraftServer.currentTick; // CraftBukkit;
+         float f;
+         int i;
+ 
+@@ -95,6 +103,19 @@
+     }
+ 
+     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());
++        if (event.isCancelled()) {
++            // Let the client know the block still exists
++            ((EntityPlayer) this.player).playerConnection.sendPacket(new PacketPlayOutBlockChange(this.world, blockposition));
++            // 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);
+@@ -121,15 +142,49 @@
+                 }
+             }
+ 
+-            this.world.douseFire((EntityHuman) null, blockposition, enumdirection);
++            // this.world.douseFire((EntityHuman) null, blockposition, enumdirection); // CraftBukkit - Moved down
+             this.lastDigTick = this.currentTick;
+             float f = 1.0F;
+ 
+-            if (block.getMaterial() != Material.AIR) {
++            // 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) == 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 (block.getMaterial() != Material.AIR) {
+                 block.attack(this.world, blockposition, this.player);
+                 f = block.getDamage(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 (block.getMaterial() != Material.AIR && f >= 1.0F) {
+                 this.breakBlock(blockposition);
+             } else {
+@@ -146,6 +201,7 @@
+ 
+     public void a(BlockPosition blockposition) {
+         if (blockposition.equals(this.f)) {
++            this.currentTick = MinecraftServer.currentTick; // CraftBukkit
+             int i = this.currentTick - this.lastDigTick;
+             Block block = this.world.getType(blockposition).getBlock();
+ 
+@@ -163,6 +219,10 @@
+                     this.j = this.lastDigTick;
+                 }
+             }
++        // CraftBukkit start - Force block reset to client
++        } else {
++            this.player.playerConnection.sendPacket(new PacketPlayOutBlockChange(this.world, blockposition));
++            // CraftBukkit end
+         }
+ 
+     }
+@@ -186,12 +246,72 @@
+     }
+ 
+     public boolean breakBlock(BlockPosition blockposition) {
+-        if (this.gamemode.d() && this.player.bz() != null && this.player.bz().getItem() instanceof ItemSword) {
++        // 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.d() && this.player.bz() != null && this.player.bz().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();
++
++            if (nmsBlock != null && !event.isCancelled() && !this.isCreative() && this.player.b(nmsBlock)) {
++                // Copied from block.a(World world, EntityHuman entityhuman, BlockPosition blockposition, IBlockData iblockdata, TileEntity tileentity)
++                if (!(nmsBlock.G() && EnchantmentManager.hasSilkTouchEnchantment(this.player))) {
++                    int data = block.getData();
++                    int bonusLevel = EnchantmentManager.getBonusBlockLootEnchantmentLevel(this.player);
++
++                    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));
++                // 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.d() && this.player.bz() != null && this.player.bz().getItem() instanceof ItemSword) {
+             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);
+-
++ 
++            // CraftBukkit start - Special case skulls, their item data comes from a tile entity
++            if (iblockdata.getBlock() == Blocks.SKULL && !this.isCreative()) {
++                iblockdata.getBlock().dropNaturally(world, blockposition, iblockdata, 1.0F, 0);
++                return this.c(blockposition);
++            }
++            // CraftBukkit end
++        
+             if (this.gamemode.c()) {
+                 if (this.gamemode == EnumGamemode.SPECTATOR) {
+                     return false;
+@@ -229,7 +349,13 @@
+                 if (flag && flag1) {
+                     iblockdata.getBlock().a(this.world, this.player, blockposition, iblockdata, tileentity);
+                 }
++            }            
++            
++            // CraftBukkit start - Drop event experience
++            if (flag && event != null) {
++                iblockdata.getBlock().dropExperience(this.world, blockposition, event.getExpToDrop());
+             }
++            // CraftBukkit end
+ 
+             return flag;
+         }
+@@ -268,6 +394,7 @@
+     }
+ 
+     public boolean interact(EntityHuman entityhuman, World world, ItemStack itemstack, BlockPosition blockposition, EnumDirection enumdirection, float f, float f1, float f2) {
++        /* CraftBukkit start - whole method
+         if (this.gamemode == EnumGamemode.SPECTATOR) {
+             TileEntity tileentity = world.getTileEntity(blockposition);
+ 
+@@ -312,6 +439,75 @@
+                 return itemstack.placeItem(entityhuman, world, blockposition, enumdirection, f, f1, f2);
+             }
+         }
++        // Interract event */
++        IBlockData blockdata = world.getType(blockposition);
++        boolean result = false;
++        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);
++            }           
++            
++            PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(entityhuman, Action.RIGHT_CLICK_BLOCK, blockposition, enumdirection, itemstack, cancelledBlock);
++            
++            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) == EnumDoorHalf.LOWER;
++                    ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, bottom ? blockposition.up() : blockposition.down()));
++                }
++                result = (event.useItemInHand() != Event.Result.ALLOW);
++            } 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).d(world, blockposition);
++                    }
++
++                    if (itileinventory != null) {
++                        entityhuman.openContainer(itileinventory);
++                        return true;
++                    }
++                } else if (tileentity instanceof IInventory) {
++                    entityhuman.openContainer((IInventory) tileentity);
++                    return true;
++                }
++
++                return false;                
++            } else if (!entityhuman.isSneaking() || itemstack == null) {
++                result = blockdata.getBlock().interact(world, blockposition, blockdata, entityhuman, enumdirection, f, f1, f2);
++            }
++
++            if (itemstack != null && !result) {
++                int j1 = itemstack.getData();
++                int k1 = itemstack.count;
++
++                result = itemstack.placeItem(entityhuman, world, blockposition, enumdirection, f, f1, f2);
++
++                // The item count should not decrement in Creative mode.
++                if (this.isCreative()) {
++                    itemstack.setData(j1);
++                    itemstack.count = k1;
++                }
++            }
++
++            // If we have 'true' and no explicit deny *or* an explicit allow -- run the item part of the hook
++            if (itemstack != null && ((!result && event.useItemInHand() != Event.Result.DENY) || event.useItemInHand() == Event.Result.ALLOW)) {
++                if (itemstack.getItem() instanceof ItemBucket) {
++                    this.useItem(entityhuman, world, itemstack);
++                } else {
++                    itemstack.placeItem(entityhuman, world, blockposition, enumdirection, f, f1, f2);
++                }
++            }
++        }
++        return result;
++        // CraftBukkit end
+     }
+ 
+     public void a(WorldServer worldserver) {