Update CraftBukkit to 1.6.1

2013-07-01 06:03:00 -05:00
parent f887b76a25
commit 6c09066e22
228 changed files with 6426 additions and 5442 deletions
--- a/src/main/java/net/minecraft/server/WorldGenerator.java
+++ b/src/main/java/net/minecraft/server/WorldGenerator.java
@@ -28,6 +28,7 @@ public abstract class WorldGenerator {
    // CraftBukkit - change signature
    protected void setTypeAndData(BlockChangeDelegate world, int i, int j, int k, int l, int i1) {
        if (this.a) {
+            // CraftBukkit - BlockChangeDelegate doesn't have the 6th parameter
            world.setTypeIdAndData(i, j, k, l, i1);
        } else {
            // CraftBukkit start - Layering violation :(