Remember, minimal diffs and *NO TABS*

This commit is contained in:
Erik Broes
2011-01-10 09:30:34 +01:00
parent b1ee09f733
commit 136ad76e6a
6 changed files with 91 additions and 91 deletions

View File

@@ -1,5 +1,6 @@
package net.minecraft.server;
import java.util.Random;
import org.bukkit.craftbukkit.CraftLivingEntity;
@@ -9,78 +10,79 @@ import org.bukkit.event.entity.EntityCombustEvent;
public class EntitySkeleton extends EntityMobs {
private static final ItemStack a;
private static final ItemStack a;
public EntitySkeleton(World world) {
super(world);
aQ = "/mob/skeleton.png";
}
public EntitySkeleton(World world) {
super(world);
aQ = "/mob/skeleton.png";
}
protected String d() {
return "mob.skeleton";
}
protected String d() {
return "mob.skeleton";
}
protected String e() {
return "mob.skeletonhurt";
}
protected String e() {
return "mob.skeletonhurt";
}
protected String f() {
return "mob.skeletonhurt";
}
protected String f() {
return "mob.skeletonhurt";
}
public void G() {
if (l.b()) {
float f1 = b(1.0F);
public void G() {
if (l.b()) {
float f1 = b(1.0F);
if (f1 > 0.5F && l.h(MathHelper.b(p), MathHelper.b(q), MathHelper.b(r)) && W.nextFloat() * 30F < (f1 - 0.4F) * 2.0F) {
//Craftbukkit start
CraftServer server = ((WorldServer) l).getServer();
EntityCombustEvent event = new EntityCombustEvent(Type.ENTITY_COMBUST, new CraftLivingEntity(server, (EntityLiving) this));
server.getPluginManager().callEvent(event);
if (!event.isCancelled()) {
Z = 300;
}
//Craftbukkit stop
}
}
super.G();
}
if (f1 > 0.5F && l.h(MathHelper.b(p), MathHelper.b(q), MathHelper.b(r)) && W.nextFloat() * 30F < (f1 - 0.4F) * 2.0F) {
//Craftbukkit start
CraftServer server = ((WorldServer) l).getServer();
EntityCombustEvent event = new EntityCombustEvent(Type.ENTITY_COMBUST, new CraftLivingEntity(server, (EntityLiving) this));
server.getPluginManager().callEvent(event);
if (!event.isCancelled()) {
Z = 300;
}
//Craftbukkit stop
}
}
super.G();
}
protected void a(Entity entity, float f1) {
if (f1 < 10F) {
double d1 = entity.p - p;
double d2 = entity.r - r;
protected void a(Entity entity, float f1) {
if (f1 < 10F) {
double d1 = entity.p - p;
double d2 = entity.r - r;
if (bg == 0) {
EntityArrow entityarrow = new EntityArrow(l, this);
if (bg == 0) {
EntityArrow entityarrow = new EntityArrow(l, this);
entityarrow.q += 1.3999999761581421D;
double d3 = entity.q - 0.20000000298023224D - entityarrow.q;
float f2 = MathHelper.a(d1 * d1 + d2 * d2) * 0.2F;
entityarrow.q += 1.3999999761581421D;
double d3 = entity.q - 0.20000000298023224D - entityarrow.q;
float f2 = MathHelper.a(d1 * d1 + d2 * d2) * 0.2F;
l.a(this, "random.bow", 1.0F, 1.0F / (W.nextFloat() * 0.4F + 0.8F));
l.a(entityarrow);
entityarrow.a(d1, d3 + (double) f2, d2, 0.6F, 12F);
bg = 30;
}
v = (float) ((Math.atan2(d2, d1) * 180D) / 3.1415927410125732D) - 90F;
ak = true;
}
}
l.a(this, "random.bow", 1.0F, 1.0F / (W.nextFloat() * 0.4F + 0.8F));
l.a(entityarrow);
entityarrow.a(d1, d3 + (double) f2, d2, 0.6F, 12F);
bg = 30;
}
v = (float) ((Math.atan2(d2, d1) * 180D) / 3.1415927410125732D) - 90F;
ak = true;
}
}
public void a(NBTTagCompound nbttagcompound) {
super.a(nbttagcompound);
}
public void a(NBTTagCompound nbttagcompound) {
super.a(nbttagcompound);
}
public void b(NBTTagCompound nbttagcompound) {
super.b(nbttagcompound);
}
public void b(NBTTagCompound nbttagcompound) {
super.b(nbttagcompound);
}
protected int g() {
return Item.j.aW;
}
protected int g() {
return Item.j.aW;
}
static {
a = new ItemStack(Item.i, 1);
}
static {
a = new ItemStack(Item.i, 1);
}
}