Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions 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

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

@@ -100,7 +100,7 @@ public class EntityEnderDragon extends EntityComplex {
this.world.a("largeexplode", this.locX + (double) f, this.locY + 2.0D + (double) d05, this.locZ + (double) f1, 0.0D, 0.0D, 0.0D);
} else {
this.v();
f = 0.2F / (MathHelper.a(this.motX * this.motX + this.motZ * this.motZ) * 10.0F + 1.0F);
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.q) {
this.o += f * 0.5F;
@@ -182,7 +182,7 @@ public class EntityEnderDragon extends EntityComplex {
this.B();
}
d1 /= (double) MathHelper.a(d0 * d0 + d2 * d2);
d1 /= (double) MathHelper.sqrt(d0 * d0 + d2 * d2);
f3 = 0.6F;
if (d1 < (double) (-f3)) {
d1 = (double) (-f3);
@@ -229,7 +229,7 @@ public class EntityEnderDragon extends EntityComplex {
}
this.aY *= 0.8F;
float f5 = MathHelper.a(this.motX * this.motX + this.motZ * this.motZ) * 1.0F + 1.0F;
float f5 = MathHelper.sqrt(this.motX * this.motX + this.motZ * this.motZ) * 1.0F + 1.0F;
double d10 = Math.sqrt(this.motX * this.motX + this.motZ * this.motZ) * 1.0D + 1.0D;
if (d10 > 40.0D) {
@@ -547,7 +547,7 @@ public class EntityEnderDragon extends EntityComplex {
i = expToDrop / 20; // 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.b(i);
j = EntityExperienceOrb.getOrbValue(i);
i -= j;
this.world.addEntity(new EntityExperienceOrb(this.world, this.locX, this.locY, this.locZ, j));
}
@@ -559,7 +559,7 @@ public class EntityEnderDragon extends EntityComplex {
i = expToDrop - 10 * (expToDrop / 20); // CraftBukkit - drop the remaining experience
while (i > 0) {
j = EntityExperienceOrb.b(i);
j = EntityExperienceOrb.getOrbValue(i);
i -= j;
this.world.addEntity(new EntityExperienceOrb(this.world, this.locX, this.locY, this.locZ, j));
}
@@ -590,7 +590,7 @@ public class EntityEnderDragon extends EntityComplex {
for (int j1 = j - b0; j1 <= j + b0; ++j1) {
double d0 = (double) (i1 - i);
double d1 = (double) (j1 - j);
double d2 = (double) MathHelper.a(d0 * d0 + d1 * d1);
double d2 = (double) MathHelper.sqrt(d0 * d0 + d1 * d1);
if (d2 <= (double) b0 - 0.5D) {
if (l < k) {