Update CraftBukkit to Minecraft 1.4.4.

1 files changed, 13 insertions, 5 deletions

diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
index 6893134e..f29eace6 100644
--- a/src/main/java/net/minecraft/server/Block.java
+++ b/src/main/java/net/minecraft/server/Block.java
@@ -377,14 +377,14 @@ public class Block {
                     int l1 = this.getDropType(l, world.random, i1);
 
                     if (l1 > 0) {
-                        this.a(world, i, j, k, new ItemStack(l1, 1, this.getDropData(l)));
+                        this.b(world, i, j, k, new ItemStack(l1, 1, this.getDropData(l)));
                     }
                 }
             }
         }
     }
 
-    protected void a(World world, int i, int j, int k, ItemStack itemstack) {
+    protected void b(World world, int i, int j, int k, ItemStack itemstack) {
         if (!world.isStatic && world.getGameRules().getBoolean("doTileDrops")) {
             float f = 0.7F;
             double d0 = (double) (world.random.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
@@ -540,7 +540,9 @@ public class Block {
 
     public void b(World world, int i, int j, int k, Entity entity) {}
 
-    public void postPlace(World world, int i, int j, int k, int l, float f, float f1, float f2) {}
+    public int getPlacedData(World world, int i, int j, int k, int l, float f, float f1, float f2, int i1) {
+        return i1;
+    }
 
     public void attack(World world, int i, int j, int k, EntityHuman entityhuman) {}
 
@@ -595,7 +597,7 @@ public class Block {
             ItemStack itemstack = this.f_(l);
 
             if (itemstack != null) {
-                this.a(world, i, j, k, itemstack);
+                this.b(world, i, j, k, itemstack);
             }
         } else {
             int i1 = EnchantmentManager.getBonusBlockLootEnchantmentLevel(entityhuman);
@@ -628,6 +630,8 @@ public class Block {
 
     public void postPlace(World world, int i, int j, int k, EntityLiving entityliving) {}
 
+    public void postPlace(World world, int i, int j, int k, int l) {}
+
     public Block b(String s) {
         this.name = "tile." + s;
         return this;
@@ -669,7 +673,7 @@ public class Block {
 
     public void a(World world, int i, int j, int k, int l, EntityHuman entityhuman) {}
 
-    public void g(World world, int i, int j, int k, int l) {}
+    public void h(World world, int i, int j, int k, int l) {}
 
     public void f(World world, int i, int j, int k) {}
 
@@ -677,6 +681,10 @@ public class Block {
         return true;
     }
 
+    public boolean a(Explosion explosion) {
+        return true;
+    }
+
     static {
         Item.byId[WOOL.id] = (new ItemCloth(WOOL.id - 256)).b("cloth");
         Item.byId[LOG.id] = (new ItemMultiTexture(LOG.id - 256, LOG, BlockLog.a)).b("log");