Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update CraftBukkit to Minecraft 1.3.1

Browse Source
This commit is contained in:
feildmaster
2012-07-29 02:33:13 -05:00
committed by Travis Watkins
parent 08e2923bd4
commit a43d621c01
240 changed files with 10763 additions and 9150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/net/minecraft/server/EntitySkeleton.java
View File

@@ -4,24 +4,24 @@ import org.bukkit.event.entity.EntityCombustEvent; // CraftBukkit
public class EntitySkeleton extends EntityMonster {
private static final ItemStack a = new ItemStack(Item.BOW, 1);
private static final ItemStack d = new ItemStack(Item.BOW, 1);
public EntitySkeleton(World world) {
super(world);
this.texture = "/mob/skeleton.png";
this.bb = 0.25F;
this.bw = 0.25F;
this.goalSelector.a(1, new PathfinderGoalFloat(this));
this.goalSelector.a(2, new PathfinderGoalRestrictSun(this));
this.goalSelector.a(3, new PathfinderGoalFleeSun(this, this.bb));
this.goalSelector.a(4, new PathfinderGoalArrowAttack(this, this.bb, 1, 60));
this.goalSelector.a(5, new PathfinderGoalRandomStroll(this, this.bb));
this.goalSelector.a(3, new PathfinderGoalFleeSun(this, this.bw));
this.goalSelector.a(4, new PathfinderGoalArrowAttack(this, this.bw, 1, 60));
this.goalSelector.a(5, new PathfinderGoalRandomStroll(this, this.bw));
this.goalSelector.a(6, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 8.0F));
this.goalSelector.a(6, new PathfinderGoalRandomLookaround(this));
this.targetSelector.a(1, new PathfinderGoalHurtByTarget(this, false));
this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget(this, EntityHuman.class, 16.0F, 0, true));
}
public boolean c_() {
public boolean aV() {
return true;
}
@@ -29,27 +29,27 @@ public class EntitySkeleton extends EntityMonster {
return 20;
}
protected String i() {
protected String aQ() {
return "mob.skeleton";
}
protected String j() {
protected String aR() {
return "mob.skeletonhurt";
}
protected String k() {
protected String aS() {
return "mob.skeletonhurt";
}
public MonsterType getMonsterType() {
return MonsterType.UNDEAD;
public EnumMonsterType getMonsterType() {
return EnumMonsterType.UNDEAD;
}
public void e() {
if (this.world.e() && !this.world.isStatic) {
float f = this.b(1.0F);
public void d() {
if (this.world.r() && !this.world.isStatic) {
float f = this.c(1.0F);
if (f > 0.5F && this.world.isChunkLoaded(MathHelper.floor(this.locX), MathHelper.floor(this.locY), MathHelper.floor(this.locZ)) && this.random.nextFloat() * 30.0F < (f - 0.4F) * 2.0F) {
if (f > 0.5F && this.world.j(MathHelper.floor(this.locX), MathHelper.floor(this.locY), MathHelper.floor(this.locZ)) && this.random.nextFloat() * 30.0F < (f - 0.4F) * 2.0F) {
// CraftBukkit start
EntityCombustEvent event = new EntityCombustEvent(this.getBukkitEntity(), 8);
this.world.getServer().getPluginManager().callEvent(event);
@@ -61,12 +61,12 @@ public class EntitySkeleton extends EntityMonster {
}
}
super.e();
super.d();
}
public void die(DamageSource damagesource) {
super.die(damagesource);
if (damagesource.b() instanceof EntityArrow && damagesource.getEntity() instanceof EntityHuman) {
if (damagesource.f() instanceof EntityArrow && damagesource.getEntity() instanceof EntityHuman) {
EntityHuman entityhuman = (EntityHuman) damagesource.getEntity();
double d0 = entityhuman.locX - this.locX;
double d1 = entityhuman.locZ - this.locZ;
@@ -84,6 +84,7 @@ public class EntitySkeleton extends EntityMonster {
protected void dropDeathLoot(boolean flag, int i) {
// CraftBukkit start - whole method
java.util.List<org.bukkit.inventory.ItemStack> loot = new java.util.ArrayList<org.bukkit.inventory.ItemStack>();
int j = this.random.nextInt(3 + i);
int count = this.random.nextInt(3 + i);
if (count > 0) {
@@ -100,7 +101,7 @@ public class EntitySkeleton extends EntityMonster {
int k = this.random.nextInt(200) - i;
if (k < 5) {
ItemStack itemstack = this.b(k <= 0 ? 1 : 0);
ItemStack itemstack = this.l(k <= 0 ? 1 : 0);
if (itemstack != null) {
loot.add(new org.bukkit.craftbukkit.inventory.CraftItemStack(itemstack));
}
@@ -112,7 +113,7 @@ public class EntitySkeleton extends EntityMonster {
}
// CraftBukkit start - return rare dropped item instead of dropping it
protected ItemStack b(int i) {
protected ItemStack l(int i) {
if (i > 0) {
ItemStack itemstack = new ItemStack(Item.BOW);