Update CraftBukkit to Minecraft 1.5.1

This commit is contained in:
Travis Watkins
2013-03-20 15:09:23 -05:00
parent 6aaa1e83df
commit 696543cf3f
21 changed files with 307 additions and 231 deletions

View File

@@ -430,7 +430,7 @@ public class EntityEnderDragon extends EntityLiving implements IComplex {
int j2 = this.world.getTypeId(k1, l1, i2);
if (j2 != 0) {
if (j2 != Block.OBSIDIAN.id && j2 != Block.WHITESTONE.id && j2 != Block.BEDROCK.id) {
if (j2 != Block.OBSIDIAN.id && j2 != Block.WHITESTONE.id && j2 != Block.BEDROCK.id && this.world.getGameRules().getBoolean("mobGriefing")) {
// CraftBukkit start - add blocks to list rather than destroying them
// flag1 = this.world.setAir(k1, l1, i2) || flag1;
flag1 = true;