Update CraftBukkit to Minecraft 1.4(.2).

1 files changed, 20 insertions, 14 deletions

diff --git a/src/main/java/net/minecraft/server/ItemInWorldManager.java b/src/main/java/net/minecraft/server/ItemInWorldManager.java
index 64515d16..5aa9ae45 100644
--- a/src/main/java/net/minecraft/server/ItemInWorldManager.java
+++ b/src/main/java/net/minecraft/server/ItemInWorldManager.java
@@ -78,7 +78,7 @@ public class ItemInWorldManager {
                 f = block.getDamage(this.player, this.player.world, this.k, this.l, this.m) * (float) (i + 1);
                 j = (int) (f * 10.0F);
                 if (j != this.o) {
-                    this.world.f(this.player.id, this.k, this.l, this.m, j);
+                    this.world.g(this.player.id, this.k, this.l, this.m, j);
                     this.o = j;
                 }
 
@@ -92,7 +92,7 @@ public class ItemInWorldManager {
             Block block1 = Block.byId[i];
 
             if (block1 == null) {
-                this.world.f(this.player.id, this.f, this.g, this.h, -1);
+                this.world.g(this.player.id, this.f, this.g, this.h, -1);
                 this.o = -1;
                 this.d = false;
             } else {
@@ -101,7 +101,7 @@ public class ItemInWorldManager {
                 f = block1.getDamage(this.player, this.player.world, this.f, this.g, this.h) * (float) (l + 1);
                 j = (int) (f * 10.0F);
                 if (j != this.o) {
-                    this.world.f(this.player.id, this.f, this.g, this.h, j);
+                    this.world.g(this.player.id, this.f, this.g, this.h, j);
                     this.o = j;
                 }
             }
@@ -113,7 +113,7 @@ public class ItemInWorldManager {
         // CraftBukkit
         PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(this.player, Action.LEFT_CLICK_BLOCK, i, j, k, l, this.player.inventory.getItemInHand());
 
-        if (!this.gamemode.isAdventure()) {
+        if (!this.gamemode.isAdventure() || this.player.f(i, j, k)) {
             // CraftBukkit start
             if (event.isCancelled()) {
                 // Let the client know the block still exists
@@ -182,7 +182,7 @@ public class ItemInWorldManager {
                     this.h = k;
                     int j1 = (int) (f * 10.0F);
 
-                    this.world.f(this.player.id, i, j, k, j1);
+                    this.world.g(this.player.id, i, j, k, j1);
                     this.o = j1;
                 }
             }
@@ -201,7 +201,7 @@ public class ItemInWorldManager {
 
                 if (f >= 0.7F) {
                     this.d = false;
-                    this.world.f(this.player.id, i, j, k, -1);
+                    this.world.g(this.player.id, i, j, k, -1);
                     this.breakBlock(i, j, k);
                 } else if (!this.j) {
                     this.d = false;
@@ -221,7 +221,7 @@ public class ItemInWorldManager {
 
     public void c(int i, int j, int k) {
         this.d = false;
-        this.world.f(this.player.id, this.f, this.g, this.h, -1);
+        this.world.g(this.player.id, this.f, this.g, this.h, -1);
     }
 
     private boolean d(int i, int j, int k) {
@@ -260,16 +260,16 @@ public class ItemInWorldManager {
             event = new BlockBreakEvent(block, this.player.getBukkitEntity());
 
             // Adventure mode pre-cancel
-            event.setCancelled(this.gamemode.isAdventure());
+            event.setCancelled(this.gamemode.isAdventure() && !this.player.f(i, j, k));
 
             // Calculate default block experience
             Block nmsBlock = Block.byId[block.getTypeId()];
 
             if (nmsBlock != null && !event.isCancelled() && !this.isCreative() && this.player.b(nmsBlock)) {
                 // Copied from Block.a(world, entityhuman, int, int, int, int)
-                if (!(nmsBlock.q_() && EnchantmentManager.hasSilkTouchEnchantment(this.player.inventory))) {
+                if (!(nmsBlock.s_() && EnchantmentManager.hasSilkTouchEnchantment(this.player))) {
                     int data = block.getData();
-                    int bonusLevel = EnchantmentManager.getBonusBlockLootEnchantmentLevel(this.player.inventory);
+                    int bonusLevel = EnchantmentManager.getBonusBlockLootEnchantmentLevel(this.player);
 
                     event.setExpToDrop(nmsBlock.getExpDrop(this.world, data, bonusLevel));
                 }
@@ -298,13 +298,13 @@ public class ItemInWorldManager {
             if (this.isCreative()) {
                 this.player.netServerHandler.sendPacket(new Packet53BlockChange(i, j, k, this.world));
             } else {
-                ItemStack itemstack = this.player.bC();
+                ItemStack itemstack = this.player.bP();
                 boolean flag1 = this.player.b(Block.byId[l]);
 
                 if (itemstack != null) {
                     itemstack.a(this.world, l, i, j, k, this.player);
                     if (itemstack.count == 0) {
-                        this.player.bD();
+                        this.player.bQ();
                     }
                 }
 
@@ -328,19 +328,25 @@ public class ItemInWorldManager {
         int j = itemstack.getData();
         ItemStack itemstack1 = itemstack.a(world, entityhuman);
 
-        if (itemstack1 == itemstack && (itemstack1 == null || itemstack1.count == i) && (itemstack1 == null || itemstack1.m() <= 0)) {
+        if (itemstack1 == itemstack && (itemstack1 == null || itemstack1.count == i && itemstack1.m() <= 0 && itemstack1.getData() == j)) {
             return false;
         } else {
             entityhuman.inventory.items[entityhuman.inventory.itemInHandIndex] = itemstack1;
             if (this.isCreative()) {
                 itemstack1.count = i;
-                itemstack1.setData(j);
+                if (itemstack1.f()) {
+                    itemstack1.setData(j);
+                }
             }
 
             if (itemstack1.count == 0) {
                 entityhuman.inventory.items[entityhuman.inventory.itemInHandIndex] = null;
             }
 
+            if (!entityhuman.bI()) {
+                ((EntityPlayer) entityhuman).updateInventory(entityhuman.defaultContainer);
+            }
+
             return true;
         }
     }