Update CraftBukkit to Minecraft 1.7.10

1 files changed, 18 insertions, 18 deletions

diff --git a/src/main/java/net/minecraft/server/EntitySkeleton.java b/src/main/java/net/minecraft/server/EntitySkeleton.java
index 47bbff12..479936f3 100644
--- a/src/main/java/net/minecraft/server/EntitySkeleton.java
+++ b/src/main/java/net/minecraft/server/EntitySkeleton.java
@@ -24,8 +24,8 @@ public class EntitySkeleton extends EntityMonster implements IRangedEntity {
         }
     }
 
-    protected void aC() {
-        super.aC();
+    protected void aD() {
+        super.aD();
         this.getAttributeInstance(GenericAttributes.d).setValue(0.25D);
     }
 
@@ -34,7 +34,7 @@ public class EntitySkeleton extends EntityMonster implements IRangedEntity {
         this.datawatcher.a(13, new Byte((byte) 0));
     }
 
-    public boolean bj() {
+    public boolean bk() {
         return true;
     }
 
@@ -42,11 +42,11 @@ public class EntitySkeleton extends EntityMonster implements IRangedEntity {
         return "mob.skeleton.say";
     }
 
-    protected String aS() {
+    protected String aT() {
         return "mob.skeleton.hurt";
     }
 
-    protected String aT() {
+    protected String aU() {
         return "mob.skeleton.death";
     }
 
@@ -110,8 +110,8 @@ public class EntitySkeleton extends EntityMonster implements IRangedEntity {
         super.e();
     }
 
-    public void aa() {
-        super.aa();
+    public void ab() {
+        super.ab();
         if (this.vehicle instanceof EntityCreature) {
             EntityCreature entitycreature = (EntityCreature) this.vehicle;
 
@@ -172,9 +172,9 @@ public class EntitySkeleton extends EntityMonster implements IRangedEntity {
         this.setEquipment(0, new ItemStack(Items.BOW));
     }
 
-    public GroupDataEntity a(GroupDataEntity groupdataentity) {
-        groupdataentity = super.a(groupdataentity);
-        if (this.world.worldProvider instanceof WorldProviderHell && this.aH().nextInt(5) > 0) {
+    public GroupDataEntity prepare(GroupDataEntity groupdataentity) {
+        groupdataentity = super.prepare(groupdataentity);
+        if (this.world.worldProvider instanceof WorldProviderHell && this.aI().nextInt(5) > 0) {
             this.goalSelector.a(4, this.bq);
             this.setSkeletonType(1);
             this.setEquipment(0, new ItemStack(Items.STONE_SWORD));
@@ -201,7 +201,7 @@ public class EntitySkeleton extends EntityMonster implements IRangedEntity {
     public void bZ() {
         this.goalSelector.a((PathfinderGoal) this.bq);
         this.goalSelector.a((PathfinderGoal) this.bp);
-        ItemStack itemstack = this.bd();
+        ItemStack itemstack = this.be();
 
         if (itemstack != null && itemstack.getItem() == Items.BOW) {
             this.goalSelector.a(4, this.bp);
@@ -212,8 +212,8 @@ public class EntitySkeleton extends EntityMonster implements IRangedEntity {
 
     public void a(EntityLiving entityliving, float f) {
         EntityArrow entityarrow = new EntityArrow(this.world, this, entityliving, 1.6F, (float) (14 - this.world.difficulty.a() * 4));
-        int i = EnchantmentManager.getEnchantmentLevel(Enchantment.ARROW_DAMAGE.id, this.bd());
-        int j = EnchantmentManager.getEnchantmentLevel(Enchantment.ARROW_KNOCKBACK.id, this.bd());
+        int i = EnchantmentManager.getEnchantmentLevel(Enchantment.ARROW_DAMAGE.id, this.be());
+        int j = EnchantmentManager.getEnchantmentLevel(Enchantment.ARROW_KNOCKBACK.id, this.be());
 
         entityarrow.b((double) (f * 2.0F) + this.random.nextGaussian() * 0.25D + (double) ((float) this.world.difficulty.a() * 0.11F));
         if (i > 0) {
@@ -224,7 +224,7 @@ public class EntitySkeleton extends EntityMonster implements IRangedEntity {
             entityarrow.setKnockbackStrength(j);
         }
 
-        if (EnchantmentManager.getEnchantmentLevel(Enchantment.ARROW_FIRE.id, this.bd()) > 0 || this.getSkeletonType() == 1) {
+        if (EnchantmentManager.getEnchantmentLevel(Enchantment.ARROW_FIRE.id, this.be()) > 0 || this.getSkeletonType() == 1) {
             // CraftBukkit start - call EntityCombustEvent
             EntityCombustEvent event = new EntityCombustEvent(entityarrow.getBukkitEntity(), 100);
             this.world.getServer().getPluginManager().callEvent(event);
@@ -236,7 +236,7 @@ public class EntitySkeleton extends EntityMonster implements IRangedEntity {
         }
 
         // CraftBukkit start
-        org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.bd(), entityarrow, 0.8F);
+        org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.be(), entityarrow, 0.8F);
         if (event.isCancelled()) {
             event.getProjectile().remove();
             return;
@@ -247,7 +247,7 @@ public class EntitySkeleton extends EntityMonster implements IRangedEntity {
         }
         // CraftBukkit end
 
-        this.makeSound("random.bow", 1.0F, 1.0F / (this.aH().nextFloat() * 0.4F + 0.8F));
+        this.makeSound("random.bow", 1.0F, 1.0F / (this.aI().nextFloat() * 0.4F + 0.8F));
         // this.world.addEntity(entityarrow); // CraftBukkit - moved up
     }
 
@@ -288,7 +288,7 @@ public class EntitySkeleton extends EntityMonster implements IRangedEntity {
         }
     }
 
-    public double ac() {
-        return super.ac() - 0.5D;
+    public double ad() {
+        return super.ad() - 0.5D;
     }
 }