Various fixes; boats, minecarts, musicblocks

5 files changed, 13 insertions, 4 deletions

diff --git a/src/main/java/net/minecraft/server/BlockStationary.java b/src/main/java/net/minecraft/server/BlockStationary.java
index 1a0d81a7..b08311cd 100644
--- a/src/main/java/net/minecraft/server/BlockStationary.java
+++ b/src/main/java/net/minecraft/server/BlockStationary.java
@@ -28,7 +28,7 @@ public class BlockStationary extends BlockFluids {
         world.i = true;
         world.a(k, l, i1, bi - 1, j1);
         world.b(k, l, i1, k, l, i1);
-        world.h(k, l, i1, bi - 1);
+        world.i(k, l, i1, bi - 1);
         world.i = false;
     }
 
diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
index d6262b58..004c8243 100644
--- a/src/main/java/net/minecraft/server/EntityBoat.java
+++ b/src/main/java/net/minecraft/server/EntityBoat.java
@@ -86,7 +86,7 @@ public class EntityBoat extends Entity implements CraftMappable { // CraftBukkit
     }
     // CraftBukkit end
 
-    public double l() {
+    public double k() {
         return (double) J * 0.0D - 0.30000001192092896D;
     }
 
@@ -317,7 +317,7 @@ public class EntityBoat extends Entity implements CraftMappable { // CraftBukkit
             double d1 = Math.cos(((double) v * 3.1415926535897931D) / 180D) * 0.40000000000000002D;
             double d2 = Math.sin(((double) v * 3.1415926535897931D) / 180D) * 0.40000000000000002D;
 
-            j.a(p + d1, q + l() + j.F(), r + d2);
+            j.a(p + d1, q + k() + j.F(), r + d2);
             return;
         }
     }
diff --git a/src/main/java/net/minecraft/server/EntityMinecart.java b/src/main/java/net/minecraft/server/EntityMinecart.java
index 60bfa25c..53367fd5 100644
--- a/src/main/java/net/minecraft/server/EntityMinecart.java
+++ b/src/main/java/net/minecraft/server/EntityMinecart.java
@@ -167,7 +167,7 @@ public class EntityMinecart extends Entity implements IInventory, CraftMappable
     }
     // CraftBukkit end
 
-    public double l() {
+    public double k() {
         return (double) J * 0.0D - 0.30000001192092896D;
     }
 
diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
index 921506ac..9a08c2da 100644
--- a/src/main/java/net/minecraft/server/ItemBlock.java
+++ b/src/main/java/net/minecraft/server/ItemBlock.java
@@ -54,6 +54,10 @@ public class ItemBlock extends Item {
             }
         }
 
+        if (itemstack.a == 0) {
+            return false;
+        }
+
         // CraftBukkit start - store the old data so we can undo it
         int oldMaterial = world.a(i, j, k);
         int oldData = world.b(i, j, k);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index baff7218..7a4645fd 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -102,6 +102,11 @@ public class WorldServer extends World {
         return explosion;
     }
 
+    public void c(int i, int j, int k, int l, int i1) {
+        super.c(i, j, k, l, i1);
+        D.f.a(i, j, k, 64D, ((Packet) (new Packet54(i, j, k, l, i1))));
+    }
+
     // CraftBukkit start
     private final CraftWorld world;
     private final CraftServer server;