twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-16 20:53:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update CraftBukkit to Minecraft 1.5

Browse Source
This commit is contained in:
Travis Watkins
2013-03-13 17:33:27 -05:00
parent ba6e4c38cf
commit 83d29e461c
246 changed files with 8499 additions and 6759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/main/java/net/minecraft/server/BlockSapling.java
View File

@@ -12,38 +12,40 @@ import org.bukkit.event.world.StructureGrowEvent;
public class BlockSapling extends BlockFlower {
public static final String[] a = new String[] { "oak", "spruce", "birch", "jungle"};
private static final String[] b = new String[] { "sapling", "sapling_spruce", "sapling_birch", "sapling_jungle"};
protected BlockSapling(int i, int j) {
super(i, j);
protected BlockSapling(int i) {
super(i);
float f = 0.4F;
this.a(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, f * 2.0F, 0.5F + f);
this.a(CreativeModeTab.c);
}
public void b(World world, int i, int j, int k, Random random) {
public void a(World world, int i, int j, int k, Random random) {
if (!world.isStatic) {
super.b(world, i, j, k, random);
super.a(world, i, j, k, random);
if (world.getLightLevel(i, j + 1, k) >= 9 && random.nextInt(7) == 0) {
int l = world.getData(i, j, k);
if ((l & 8) == 0) {
world.setData(i, j, k, l | 8);
} else {
this.grow(world, i, j, k, random, false, null, null); // CraftBukkit - added bonemeal, player and itemstack
}
this.grow(world, i, j, k, random, false, null, null); // CraftBukkit - added bonemeal, player and itemstack
}
}
}
public int a(int i, int j) {
j &= 3;
return j == 1 ? 63 : (j == 2 ? 79 : (j == 3 ? 30 : super.a(i, j)));
// CraftBukkit - added bonemeal, player and itemstack
public void grow(World world, int i, int j, int k, Random random, boolean bonemeal, org.bukkit.entity.Player player, ItemStack itemstack) {
int l = world.getData(i, j, k);
if ((l & 8) == 0) {
world.setData(i, j, k, l | 8, 4);
} else {
this.d(world, i, j, k, random, bonemeal, player, itemstack); // CraftBukkit
}
}
// CraftBukkit - added bonemeal, player and itemstack
public void grow(World world, int i, int j, int k, Random random, boolean bonemeal, org.bukkit.entity.Player player, ItemStack itemstack) {
public void d(World world, int i, int j, int k, Random random, boolean bonemeal, org.bukkit.entity.Player player, ItemStack itemstack) {
int l = world.getData(i, j, k) & 3;
Object object = null;
int i1 = 0;
int j1 = 0;
boolean flag = false;
@@ -91,12 +93,12 @@ public class BlockSapling extends BlockFlower {
}
if (flag) {
world.setRawTypeId(i + i1, j, k + j1, 0);
world.setRawTypeId(i + i1 + 1, j, k + j1, 0);
world.setRawTypeId(i + i1, j, k + j1 + 1, 0);
world.setRawTypeId(i + i1 + 1, j, k + j1 + 1, 0);
world.setTypeIdAndData(i + i1, j, k + j1, 0, 0, 4);
world.setTypeIdAndData(i + i1 + 1, j, k + j1, 0, 0, 4);
world.setTypeIdAndData(i + i1, j, k + j1 + 1, 0, 0, 4);
world.setTypeIdAndData(i + i1 + 1, j, k + j1 + 1, 0, 0, 4);
} else {
world.setRawTypeId(i, j, k, 0);
world.setTypeIdAndData(i, j, k, 0, 0, 4);
}
grownTree = gen.generate(delegate, random, i + i1, j, k + j1);
@@ -117,12 +119,12 @@ public class BlockSapling extends BlockFlower {
}
if (!grownTree) {
if (flag) {
world.setRawTypeIdAndData(i + i1, j, k + j1, this.id, l);
world.setRawTypeIdAndData(i + i1 + 1, j, k + j1, this.id, l);
world.setRawTypeIdAndData(i + i1, j, k + j1 + 1, this.id, l);
world.setRawTypeIdAndData(i + i1 + 1, j, k + j1 + 1, this.id, l);
world.setTypeIdAndData(i + i1, j, k + j1, this.id, l, 4);
world.setTypeIdAndData(i + i1 + 1, j, k + j1, this.id, l, 4);
world.setTypeIdAndData(i + i1, j, k + j1 + 1, this.id, l, 4);
world.setTypeIdAndData(i + i1 + 1, j, k + j1 + 1, this.id, l, 4);
} else {
world.setRawTypeIdAndData(i, j, k, this.id, l);
world.setTypeIdAndData(i, j, k, this.id, l, 4);
}
}
// CraftBukkit end