Rebuild patches after merge

This commit is contained in:
Zach Brown
2014-09-01 15:17:42 -05:00
parent f9d6872641
commit acfc7ba3e2

View File

@@ -10,7 +10,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+++ b/src/main/java/net/minecraft/server/BlockMinecartTrackAbstract.java +++ b/src/main/java/net/minecraft/server/BlockMinecartTrackAbstract.java
@@ -0,0 +0,0 @@ public abstract class BlockMinecartTrackAbstract extends Block { @@ -0,0 +0,0 @@ public abstract class BlockMinecartTrackAbstract extends Block {
} }
if (flag) { if (flag) {
- this.b(world, i, j, k, world.getData(i, j, k), 0); - this.b(world, i, j, k, world.getData(i, j, k), 0);
- world.setAir(i, j, k); - world.setAir(i, j, k);
@@ -23,6 +23,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} else { } else {
this.a(world, i, j, k, l, i1, block); this.a(world, i, j, k, l, i1, block);
} }
-- --
1.9.4.msysgit.0