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

Update to Minecraft 1.3 beta

Browse Source
This commit is contained in:
Dinnerbone
2011-02-23 02:37:56 +00:00
parent a124bfdab5
commit f759e0b60d
83 changed files with 3182 additions and 3292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/net/minecraft/server/EntityCreature.java
View File

@@ -18,7 +18,7 @@ public class EntityCreature extends EntityLiving {
super(world);
}
protected void d() {
protected void c_() {
this.e = false;
float f = 16.0F;
@@ -41,7 +41,7 @@ public class EntityCreature extends EntityLiving {
if (this.d != null) {
this.a = this.world.a(this, this.d, f);
}
} else if (!this.d.B()) {
} else if (!this.d.J()) {
// CraftBukkit start
EntityTargetEvent event = new EntityTargetEvent(this.getBukkitEntity(), null, TargetReason.TARGET_DIED);
CraftServer server = ((WorldServer) this.world).getServer();
@@ -55,9 +55,9 @@ public class EntityCreature extends EntityLiving {
}
// CraftBukkit end
} else {
float f1 = this.d.a((Entity) this);
float f1 = this.d.f(this);
if (this.i(this.d)) {
if (this.e(this.d)) {
this.a(this.d, f1);
}
}
@@ -92,8 +92,8 @@ public class EntityCreature extends EntityLiving {
}
int l1 = MathHelper.b(this.boundingBox.b);
boolean flag1 = this.v();
boolean flag2 = this.x();
boolean flag1 = this.g_();
boolean flag2 = this.Q();
this.pitch = 0.0F;
if (this.a != null && this.random.nextInt(100) != 0) {
@@ -110,7 +110,7 @@ public class EntityCreature extends EntityLiving {
}
}
this.bA = false;
this.ax = false;
if (vec3d != null) {
double d1 = vec3d.a - this.locX;
double d2 = vec3d.c - this.locZ;
@@ -118,7 +118,7 @@ public class EntityCreature extends EntityLiving {
float f4 = (float) (TrigMath.atan2(d2, d1) * 180.0D / 3.1415927410125732D) - 90.0F; // Craftbukkit
float f5 = f4 - this.yaw;
for (this.by = this.bC; f5 < -180.0F; f5 += 360.0F) {
for (this.av = this.az; f5 < -180.0F; f5 += 360.0F) {
;
}
@@ -142,12 +142,12 @@ public class EntityCreature extends EntityLiving {
this.yaw = (float) (Math.atan2(d5, d4) * 180.0D / 3.1415927410125732D) - 90.0F;
f5 = (f6 - this.yaw + 90.0F) * 3.1415927F / 180.0F;
this.bx = -MathHelper.a(f5) * this.by * 1.0F;
this.by = MathHelper.b(f5) * this.by * 1.0F;
this.au = -MathHelper.a(f5) * this.av * 1.0F;
this.av = MathHelper.b(f5) * this.av * 1.0F;
}
if (d3 > 0.0D) {
this.bA = true;
this.ax = true;
}
}
@@ -155,15 +155,15 @@ public class EntityCreature extends EntityLiving {
this.b(this.d, 30.0F);
}
if (this.B) {
this.bA = true;
if (this.aV) {
this.ax = true;
}
if (this.random.nextFloat() < 0.8F && (flag1 || flag2)) {
this.bA = true;
this.ax = true;
}
} else {
super.d();
super.c_();
this.a = null;
}
}