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 for 1.1_01 renames.

Browse Source 
We know these updates (can) break plugins bypassing Bukkit. They are needed for
smooth updates however. There will be another one right before before 1.1-R1.
This commit is contained in:
Erik Broes
2012-01-14 21:03:48 +01:00
parent 6495eee0c9
commit 61ec751ca1
85 changed files with 466 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ public class BlockSapling extends BlockFlower {
if ((l & 8) == 0) {
world.setData(i, j, k, l | 8);
} else {
this.b(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
}
}
}
@@ -41,11 +41,10 @@ public class BlockSapling extends BlockFlower {
}
// CraftBukkit - added bonemeal, player and itemstack
public void b(World world, int i, int j, int k, Random random, boolean bonemeal, Player player, ItemStack itemstack) {
public void grow(World world, int i, int j, int k, Random random, boolean bonemeal, Player player, ItemStack itemstack) {
int l = world.getData(i, j, k) & 3;
world.setRawTypeId(i, j, k, 0);
// CraftBukkit start - fixes client updates on recently grown trees
boolean grownTree;
BlockChangeWithNotify delegate = new BlockChangeWithNotify(world);
@@ -74,9 +73,9 @@ public class BlockSapling extends BlockFlower {
--itemstack.count;
}
if (!grownTree || event.isCancelled()) {
// CraftBukkit end
world.setRawTypeIdAndData(i, j, k, this.id, l);
}
// CraftBukkit end
}
protected int getDropData(int i) {