Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update CraftBukkit to Minecraft 1.7.2

Browse Source
This commit is contained in:
mbax
2013-11-04 07:07:38 -06:00
committed by Wesley Wolfe
parent ff8b70fbb7
commit 2726696652
349 changed files with 14339 additions and 11287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/main/java/net/minecraft/server/BlockDispenser.java
View File

@@ -8,8 +8,8 @@ public class BlockDispenser extends BlockContainer {
protected Random b = new Random();
public static boolean eventFired = false; // CraftBukkit
protected BlockDispenser(int i) {
super(i, Material.STONE);
protected BlockDispenser() {
super(Material.STONE);
this.a(CreativeModeTab.d);
}
@@ -19,30 +19,30 @@ public class BlockDispenser extends BlockContainer {
public void onPlace(World world, int i, int j, int k) {
super.onPlace(world, i, j, k);
this.k(world, i, j, k);
this.m(world, i, j, k);
}
private void k(World world, int i, int j, int k) {
private void m(World world, int i, int j, int k) {
if (!world.isStatic) {
int l = world.getTypeId(i, j, k - 1);
int i1 = world.getTypeId(i, j, k + 1);
int j1 = world.getTypeId(i - 1, j, k);
int k1 = world.getTypeId(i + 1, j, k);
Block block = world.getType(i, j, k - 1);
Block block1 = world.getType(i, j, k + 1);
Block block2 = world.getType(i - 1, j, k);
Block block3 = world.getType(i + 1, j, k);
byte b0 = 3;
if (Block.t[l] && !Block.t[i1]) {
if (block.j() && !block1.j()) {
b0 = 3;
}
if (Block.t[i1] && !Block.t[l]) {
if (block1.j() && !block.j()) {
b0 = 2;
}
if (Block.t[j1] && !Block.t[k1]) {
if (block2.j() && !block3.j()) {
b0 = 5;
}
if (Block.t[k1] && !Block.t[j1]) {
if (block3.j() && !block2.j()) {
b0 = 4;
}
@@ -64,13 +64,13 @@ public class BlockDispenser extends BlockContainer {
}
}
// CraftBukkit - private -> public
// CraftBukkit - protected -> public
public void dispense(World world, int i, int j, int k) {
SourceBlock sourceblock = new SourceBlock(world, i, j, k);
TileEntityDispenser tileentitydispenser = (TileEntityDispenser) sourceblock.getTileEntity();
if (tileentitydispenser != null) {
int l = tileentitydispenser.j();
int l = tileentitydispenser.i();
if (l < 0) {
world.triggerEffect(1001, i, j, k, 0);
@@ -92,16 +92,16 @@ public class BlockDispenser extends BlockContainer {
return (IDispenseBehavior) a.a(itemstack.getItem());
}
public void doPhysics(World world, int i, int j, int k, int l) {
public void doPhysics(World world, int i, int j, int k, Block block) {
boolean flag = world.isBlockIndirectlyPowered(i, j, k) || world.isBlockIndirectlyPowered(i, j + 1, k);
int i1 = world.getData(i, j, k);
boolean flag1 = (i1 & 8) != 0;
int l = world.getData(i, j, k);
boolean flag1 = (l & 8) != 0;
if (flag && !flag1) {
world.a(i, j, k, this.id, this.a(world));
world.setData(i, j, k, i1 | 8, 4);
world.a(i, j, k, this, this.a(world));
world.setData(i, j, k, l | 8, 4);
} else if (!flag && flag1) {
world.setData(i, j, k, i1 & -9, 4);
world.setData(i, j, k, l & -9, 4);
}
}
@@ -111,7 +111,7 @@ public class BlockDispenser extends BlockContainer {
}
}
public TileEntity b(World world) {
public TileEntity a(World world, int i) {
return new TileEntityDispenser();
}
@@ -124,12 +124,12 @@ public class BlockDispenser extends BlockContainer {
}
}
public void remove(World world, int i, int j, int k, int l, int i1) {
public void remove(World world, int i, int j, int k, Block block, int l) {
TileEntityDispenser tileentitydispenser = (TileEntityDispenser) world.getTileEntity(i, j, k);
if (tileentitydispenser != null) {
for (int j1 = 0; j1 < tileentitydispenser.getSize(); ++j1) {
ItemStack itemstack = tileentitydispenser.getItem(j1);
for (int i1 = 0; i1 < tileentitydispenser.getSize(); ++i1) {
ItemStack itemstack = tileentitydispenser.getItem(i1);
if (itemstack != null) {
float f = this.b.nextFloat() * 0.8F + 0.1F;
@@ -137,14 +137,14 @@ public class BlockDispenser extends BlockContainer {
float f2 = this.b.nextFloat() * 0.8F + 0.1F;
while (itemstack.count > 0) {
int k1 = this.b.nextInt(21) + 10;
int j1 = this.b.nextInt(21) + 10;
if (k1 > itemstack.count) {
k1 = itemstack.count;
if (j1 > itemstack.count) {
j1 = itemstack.count;
}
itemstack.count -= k1;
EntityItem entityitem = new EntityItem(world, (double) ((float) i + f), (double) ((float) j + f1), (double) ((float) k + f2), new ItemStack(itemstack.id, k1, itemstack.getData()));
itemstack.count -= j1;
EntityItem entityitem = new EntityItem(world, (double) ((float) i + f), (double) ((float) j + f1), (double) ((float) k + f2), new ItemStack(itemstack.getItem(), j1, itemstack.getData()));
if (itemstack.hasTag()) {
entityitem.getItemStack().setTag((NBTTagCompound) itemstack.getTag().clone());
@@ -160,14 +160,14 @@ public class BlockDispenser extends BlockContainer {
}
}
world.m(i, j, k, l);
world.f(i, j, k, block);
}
super.remove(world, i, j, k, l, i1);
super.remove(world, i, j, k, block, l);
}
public static IPosition a(ISourceBlock isourceblock) {
EnumFacing enumfacing = l_(isourceblock.h());
EnumFacing enumfacing = b(isourceblock.h());
double d0 = isourceblock.getX() + 0.7D * (double) enumfacing.c();
double d1 = isourceblock.getY() + 0.7D * (double) enumfacing.d();
double d2 = isourceblock.getZ() + 0.7D * (double) enumfacing.e();
@@ -175,15 +175,15 @@ public class BlockDispenser extends BlockContainer {
return new Position(d0, d1, d2);
}
public static EnumFacing l_(int i) {
public static EnumFacing b(int i) {
return EnumFacing.a(i & 7);
}
public boolean q_() {
public boolean M() {
return true;
}
public int b_(World world, int i, int j, int k, int l) {
public int g(World world, int i, int j, int k, int l) {
return Container.b((IInventory) world.getTileEntity(i, j, k));
}
}