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

109
src/main/java/net/minecraft/server/EntityEnderDragon.java
View File

@@ -41,19 +41,19 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
this.children = new EntityComplexPart[] { this.bq = new EntityComplexPart(this, "head", 6.0F, 6.0F), this.br = new EntityComplexPart(this, "body", 8.0F, 8.0F), this.bs = new EntityComplexPart(this, "tail", 4.0F, 4.0F), this.bt = new EntityComplexPart(this, "tail", 4.0F, 4.0F), this.bu = new EntityComplexPart(this, "tail", 4.0F, 4.0F), this.bv = new EntityComplexPart(this, "wing", 4.0F, 4.0F), this.bw = new EntityComplexPart(this, "wing", 4.0F, 4.0F)};
this.setHealth(this.getMaxHealth());
this.a(16.0F, 8.0F);
this.Z = true;
this.Y = true;
this.fireProof = true;
this.i = 100.0D;
this.am = true;
this.al = true;
}
protected void az() {
super.az();
protected void aD() {
super.aD();
this.getAttributeInstance(GenericAttributes.a).setValue(200.0D);
}
protected void a() {
super.a();
protected void c() {
super.c();
}
public double[] b(int i, float f) {
@@ -76,7 +76,7 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
return adouble;
}
public void c() {
public void e() {
float f;
float f1;
@@ -97,7 +97,7 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
f2 = (this.random.nextFloat() - 0.5F) * 8.0F;
this.world.addParticle("largeexplode", this.locX + (double) f, this.locY + 2.0D + (double) f1, this.locZ + (double) f2, 0.0D, 0.0D, 0.0D);
} else {
this.bJ();
this.bN();
f = 0.2F / (MathHelper.sqrt(this.motX * this.motX + this.motZ * this.motZ) * 10.0F + 1.0F);
f *= (float) Math.pow(2.0D, this.motY);
if (this.bA) {
@@ -161,8 +161,8 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
this.j += this.random.nextGaussian() * 2.0D;
}
if (this.bz || d3 < 100.0D || d3 > 22500.0D || this.positionChanged || this.H) {
this.bK();
if (this.bz || d3 < 100.0D || d3 > 22500.0D || this.positionChanged || this.G) {
this.bO();
}
d1 /= (double) MathHelper.sqrt(d0 * d0 + d2 * d2);
@@ -243,11 +243,11 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
float f11 = MathHelper.sin(f10);
float f12 = MathHelper.cos(f10);
this.br.l_();
this.br.h();
this.br.setPositionRotation(this.locX + (double) (f11 * 0.5F), this.locY, this.locZ - (double) (f12 * 0.5F), 0.0F, 0.0F);
this.bv.l_();
this.bv.h();
this.bv.setPositionRotation(this.locX + (double) (f12 * 4.5F), this.locY + 2.0D, this.locZ + (double) (f11 * 4.5F), 0.0F, 0.0F);
this.bw.l_();
this.bw.h();
this.bw.setPositionRotation(this.locX - (double) (f12 * 4.5F), this.locY + 2.0D, this.locZ - (double) (f11 * 4.5F), 0.0F, 0.0F);
if (!this.world.isStatic && this.hurtTicks == 0) {
this.a(this.world.getEntities(this, this.bv.boundingBox.grow(4.0D, 2.0D, 4.0D).d(0.0D, -2.0D, 0.0D)));
@@ -261,7 +261,7 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
f3 = MathHelper.sin(this.yaw * 3.1415927F / 180.0F - this.bg * 0.01F);
float f13 = MathHelper.cos(this.yaw * 3.1415927F / 180.0F - this.bg * 0.01F);
this.bq.l_();
this.bq.h();
this.bq.setPositionRotation(this.locX + (double) (f3 * 5.5F * f2), this.locY + (adouble1[1] - adouble[1]) * 1.0D + (double) (f9 * 5.5F), this.locZ - (double) (f13 * 5.5F * f2), 0.0F, 0.0F);
for (int j = 0; j < 3; ++j) {
@@ -286,7 +286,7 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
float f17 = 1.5F;
float f18 = (float) (j + 1) * 2.0F;
entitycomplexpart.l_();
entitycomplexpart.h();
entitycomplexpart.setPositionRotation(this.locX - (double) ((f11 * f17 + f15 * f18) * f2), this.locY + (adouble2[1] - adouble[1]) * 1.0D - (double) ((f18 + f17) * f9) + 1.5D, this.locZ + (double) ((f12 * f17 + f16 * f18) * f2), 0.0F, 0.0F);
}
@@ -296,7 +296,7 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
}
}
private void bJ() {
private void bN() {
if (this.bC != null) {
if (this.bC.dead) {
if (!this.world.isStatic) {
@@ -304,7 +304,7 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
}
this.bC = null;
} else if (this.ticksLived % 10 == 0 && this.getHealth() < this.getMaxHealth()) { // CraftBukkit - this.getMaxHealth() -> this.maxHealth
} else if (this.ticksLived % 10 == 0 && this.getHealth() < this.getMaxHealth()) {
// CraftBukkit start
EntityRegainHealthEvent event = new EntityRegainHealthEvent(this.getBukkitEntity(), 1.0D, EntityRegainHealthEvent.RegainReason.ENDER_CRYSTAL);
this.world.getServer().getPluginManager().callEvent(event);
@@ -365,7 +365,7 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
}
}
private void bK() {
private void bO() {
this.bz = false;
if (this.random.nextInt(2) == 0 && !this.world.players.isEmpty()) {
this.bD = (Entity) this.world.players.get(this.random.nextInt(this.world.players.size()));
@@ -411,10 +411,10 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
for (int k1 = i; k1 <= l; ++k1) {
for (int l1 = j; l1 <= i1; ++l1) {
for (int i2 = k; i2 <= j1; ++i2) {
int j2 = this.world.getTypeId(k1, l1, i2);
Block block = this.world.getType(k1, l1, i2);
if (j2 != 0) {
if (j2 != Block.OBSIDIAN.id && j2 != Block.WHITESTONE.id && j2 != Block.BEDROCK.id && this.world.getGameRules().getBoolean("mobGriefing")) {
if (block.getMaterial() != Material.AIR) {
if (block != Blocks.OBSIDIAN && block != Blocks.WHITESTONE && block != Blocks.BEDROCK && 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;
@@ -444,9 +444,8 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
}
} else {
for (org.bukkit.block.Block block : event.blockList()) {
int blockId = block.getTypeId();
if (blockId == 0) {
org.bukkit.Material blockId = block.getType();
if (blockId == org.bukkit.Material.AIR) {
continue;
}
@@ -454,10 +453,11 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
int blockY = block.getY();
int blockZ = block.getZ();
if (Block.byId[blockId].a(explosionSource)) {
Block.byId[blockId].dropNaturally(this.world, blockX, blockY, blockZ, block.getData(), event.getYield(), 0);
Block nmsBlock = org.bukkit.craftbukkit.util.CraftMagicNumbers.getBlock(blockId);
if (nmsBlock.a(explosionSource)) {
nmsBlock.dropNaturally(this.world, blockX, blockY, blockZ, block.getData(), event.getYield(), 0);
}
Block.byId[blockId].wasExploded(world, blockX, blockY, blockZ, explosionSource);
nmsBlock.wasExploded(world, blockX, blockY, blockZ, explosionSource);
this.world.setAir(blockX, blockY, blockZ);
}
@@ -502,7 +502,8 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
return super.damageEntity(damagesource, f);
}
protected void aB() {
protected void aF() {
if (this.dead) return; // CraftBukkit - can't kill what's already dead
++this.bB;
if (this.bB >= 180 && this.bB <= 200) {
float f = (this.random.nextFloat() - 0.5F) * 8.0F;
@@ -517,7 +518,7 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
if (!this.world.isStatic) {
if (this.bB > 150 && this.bB % 5 == 0) {
i = expToDrop / 12; // CraftBukkit - drop experience as dragon falls from sky. use experience drop from death event. This is now set in getExpReward()
i = this.expToDrop / 12; // CraftBukkit - drop experience as dragon falls from sky. use experience drop from death event. This is now set in getExpReward()
while (i > 0) {
j = EntityExperienceOrb.getOrbValue(i);
@@ -527,14 +528,14 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
}
if (this.bB == 1) {
this.world.d(1018, (int) this.locX, (int) this.locY, (int) this.locZ, 0);
this.world.b(1018, (int) this.locX, (int) this.locY, (int) this.locZ, 0);
}
}
this.move(0.0D, 0.10000000149011612D, 0.0D);
this.aN = this.yaw += 20.0F;
if (this.bB == 200 && !this.world.isStatic) {
i = expToDrop - 10 * (expToDrop / 12); // CraftBukkit - drop the remaining experience
i = this.expToDrop - (10 * this.expToDrop / 12); // CraftBukkit - drop the remaining experience
while (i > 0) {
j = EntityExperienceOrb.getOrbValue(i);
@@ -542,12 +543,12 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
this.world.addEntity(new EntityExperienceOrb(this.world, this.locX, this.locY, this.locZ, j));
}
this.c(MathHelper.floor(this.locX), MathHelper.floor(this.locZ));
this.b(MathHelper.floor(this.locX), MathHelper.floor(this.locZ));
this.die();
}
}
private void c(int i, int j) {
private void b(int i, int j) {
byte b0 = 64;
BlockEnderPortal.a = true;
@@ -566,29 +567,29 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
if (d2 <= ((double) b1 - 0.5D) * ((double) b1 - 0.5D)) {
if (k < b0) {
if (d2 <= ((double) (b1 - 1) - 0.5D) * ((double) (b1 - 1) - 0.5D)) {
world.setTypeId(l, k, i1, Block.BEDROCK.id);
world.setTypeUpdate(l, k, i1, Blocks.BEDROCK);
}
} else if (k > b0) {
world.setTypeId(l, k, i1, 0);
world.setTypeUpdate(l, k, i1, Blocks.AIR);
} else if (d2 > ((double) (b1 - 1) - 0.5D) * ((double) (b1 - 1) - 0.5D)) {
world.setTypeId(l, k, i1, Block.BEDROCK.id);
world.setTypeUpdate(l, k, i1, Blocks.BEDROCK);
} else {
world.setTypeId(l, k, i1, Block.ENDER_PORTAL.id);
world.setTypeUpdate(l, k, i1, Blocks.ENDER_PORTAL);
}
}
}
}
}
world.setTypeId(i, b0 + 0, j, Block.BEDROCK.id);
world.setTypeId(i, b0 + 1, j, Block.BEDROCK.id);
world.setTypeId(i, b0 + 2, j, Block.BEDROCK.id);
world.setTypeId(i - 1, b0 + 2, j, Block.TORCH.id);
world.setTypeId(i + 1, b0 + 2, j, Block.TORCH.id);
world.setTypeId(i, b0 + 2, j - 1, Block.TORCH.id);
world.setTypeId(i, b0 + 2, j + 1, Block.TORCH.id);
world.setTypeId(i, b0 + 3, j, Block.BEDROCK.id);
world.setTypeId(i, b0 + 4, j, Block.DRAGON_EGG.id);
world.setType(i, b0 + 0, j, Blocks.BEDROCK);
world.setType(i, b0 + 1, j, Blocks.BEDROCK);
world.setType(i, b0 + 2, j, Blocks.BEDROCK);
world.setType(i - 1, b0 + 2, j, Blocks.TORCH);
world.setType(i + 1, b0 + 2, j, Blocks.TORCH);
world.setType(i, b0 + 2, j - 1, Blocks.TORCH);
world.setType(i, b0 + 2, j + 1, Blocks.TORCH);
world.setType(i, b0 + 3, j, Blocks.BEDROCK);
world.setType(i, b0 + 4, j, Blocks.DRAGON_EGG);
EntityCreatePortalEvent event = new EntityCreatePortalEvent((org.bukkit.entity.LivingEntity) this.getBukkitEntity(), java.util.Collections.unmodifiableList(world.getList()), org.bukkit.PortalType.ENDER);
this.world.getServer().getPluginManager().callEvent(event);
@@ -599,7 +600,7 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
}
} else {
for (BlockState state : event.getBlocks()) {
Packet53BlockChange packet = new Packet53BlockChange(state.getX(), state.getY(), state.getZ(), this.world);
PacketPlayOutBlockChange packet = new PacketPlayOutBlockChange(state.getX(), state.getY(), state.getZ(), this.world);
for (Iterator it = this.world.players.iterator(); it.hasNext();) {
EntityHuman entity = (EntityHuman) it.next();
if (entity instanceof EntityPlayer) {
@@ -613,29 +614,29 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
BlockEnderPortal.a = false;
}
protected void u() {}
protected void w() {}
public Entity[] ao() {
public Entity[] at() {
return this.children;
}
public boolean L() {
public boolean R() {
return false;
}
public World b() {
public World a() {
return this.world;
}
protected String r() {
protected String t() {
return "mob.enderdragon.growl";
}
protected String aO() {
protected String aT() {
return "mob.enderdragon.hit";
}
protected float ba() {
protected float bf() {
return 5.0F;
}