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

Update CraftBukkit to Minecraft 1.3.1

Browse Source
This commit is contained in:
feildmaster
2012-07-29 02:33:13 -05:00
committed by Travis Watkins
parent 08e2923bd4
commit a43d621c01
240 changed files with 10763 additions and 9150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/net/minecraft/server/WorldGenTrees.java
View File

@@ -24,11 +24,7 @@ public class WorldGenTrees extends WorldGenerator implements BlockSapling.TreeGe
}
public boolean a(World world, Random random, int i, int j, int k) {
// CraftBukkit start
// sk: The idea is to have (our) WorldServer implement
// BlockChangeDelegate and then we can implicitly cast World to
// WorldServer (a safe cast, AFAIK) and no code will be broken. This
// then allows plugins to catch manually-invoked generation events
// CraftBukkit start - moved to generate
return this.generate((BlockChangeDelegate) world, random, i, j, k);
}
@@ -148,6 +144,17 @@ public class WorldGenTrees extends WorldGenerator implements BlockSapling.TreeGe
}
}
}
if (random.nextInt(5) == 0 && l > 5) {
for (j1 = 0; j1 < 2; ++j1) {
for (k1 = 0; k1 < 4; ++k1) {
if (random.nextInt(4 - j1) == 0) {
i2 = random.nextInt(3);
this.setTypeAndData(world, i + Direction.a[Direction.e[k1]], j + l - 5 + j1, k + Direction.b[Direction.e[k1]], Block.COCOA.id, i2 << 2 | k1);
}
}
}
}
}
return true;